Michael Niedermayer 5743095ca9 Merge commit '9d3009c6c4b9b6734f07df7c88f6a42ded6cdf38' ...

* commit '9d3009c6c4b9b6734f07df7c88f6a42ded6cdf38':
  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: Michael Niedermayer <michaelni@gmx.at>

2013-03-12 18:10:35 +01:00

16 KiB

Raw Blame History

View Raw