Michael Niedermayer
41bf67d8d4
Merge remote-tracking branch 'qatar/master'
* qatar/master:
movenc: change AV_LOG_INFO to AV_LOG_WARNING for some warnings
avconv: remove a write-only variable
avconv: remove pointless parameter from new_*_stream().
avconv: cosmetics, move code
avconv: cosmetics -- move copy_chapters().
avconv: cosmetics -- move parse_forced_key_frames().
lavc: add audio flag to the 'b' option, deprecate 'ab'.
avconv: rename sameq to same_quant
doc/avconv: add forgotten end of chapter.
Changelog: document avconv incompatibilities with ffmpeg.
avconv: replace -vcodec/-acodec/-scodec with a better system.
avconv: remove presets.
svq3: propagate codec memory allocation failure in context init
Conflicts:
Changelog
avconv.c
libavcodec/options.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-16 23:47:35 +02:00
..
2011-07-04 18:33:04 +01:00
2011-08-13 22:24:47 +02:00
2011-08-16 23:47:35 +02:00
2011-07-07 22:47:24 +02:00
2011-07-14 18:22:36 +02:00
2011-08-16 03:38:00 +02:00
2011-05-20 13:50:52 +01:00
2011-08-01 11:36:16 +02:00
2011-08-01 11:36:16 +02:00
2011-08-01 11:36:16 +02:00
2011-08-16 23:47:35 +02:00
2011-08-13 02:56:08 +02:00
2011-08-15 23:11:46 +02:00
2011-08-16 03:38:00 +02:00
2011-05-12 04:51:24 +02:00
2011-04-29 18:08:46 +02:00