Skip to content
Snippets Groups Projects
Commit 5743095c authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit '9d3009c6'


* commit '9d3009c6':
  avconv: print an error on applying options of the wrong type.
  atomic: Check for __sync_val_compare_and_swap instead of __sync_synchronize
  output-example: Update to use encode_video2 instead of the now dropped encode_video

Conflicts:
	doc/examples/muxing.c
	ffmpeg_opt.c
	libavutil/atomic.h

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 6b6b0e9d 9d3009c6
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment