Merge commit '9d3009c6c4b9b6734f07df7c88f6a42ded6cdf38'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Mar 2013 17:10:35 +0000 (18:10 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Mar 2013 17:10:35 +0000 (18:10 +0100)
commit5743095ca9566db981b8fe113fc4f330dda5798a
tree6b41bfefa2e2ceb11acb489108ce3ad7e72f5922
parent6b6b0e9daed339ed8da7606a8b043aed6ee2a4c4
parent9d3009c6c4b9b6734f07df7c88f6a42ded6cdf38
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>
cmdutils.c
cmdutils.h
doc/examples/muxing.c
ffmpeg_opt.c