[FFmpeg-cvslog] Merge commit '9d3009c6c4b9b6734f07df7c88f6a42ded6cdf38'

Michael Niedermayer git at videolan.org
Tue Mar 12 18:17:16 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 12 18:10:35 2013 +0100| [5743095ca9566db981b8fe113fc4f330dda5798a] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5743095ca9566db981b8fe113fc4f330dda5798a
---





More information about the ffmpeg-cvslog mailing list