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-27 02:05:49 +02:00
2011-08-14 01:56:28 +02:00
2011-08-16 23:47:35 +02:00
2011-05-11 13:43:30 +02:00
2011-03-17 17:26:45 +01:00
2011-03-29 02:27:13 +02:00
2011-05-20 10:14:00 +02:00
2011-08-09 19:56:21 +02:00
2011-08-15 23:35:53 +02:00
2011-06-02 14:43:29 +02:00
2011-06-07 00:37:00 +02:00
2011-07-13 00:42:11 +02:00
2011-05-27 10:41:46 +02:00
2011-04-19 01:17:59 +02:00
2011-08-09 19:56:25 +02:00
2011-08-09 19:56:21 +02:00
2011-08-09 19:56:24 +02:00
2011-08-09 19:56:25 +02:00
2011-08-09 19:56:25 +02:00
2011-08-13 02:56:08 +02:00
2011-08-14 16:29:44 +02:00
2011-08-09 19:56:25 +02:00
2011-04-10 04:31:54 +02:00
2011-08-11 17:32:54 +02:00
2011-07-01 20:53:45 +02:00
2011-08-09 19:56:21 +02:00
2011-06-29 09:14:56 +01:00
2011-03-17 17:26:45 +01:00
2011-03-17 17:26:45 +01:00
2011-07-10 04:28:50 +02:00
2011-04-08 01:35:43 +02:00
2011-06-05 13:17:38 +02:00
2011-08-09 19:56:21 +02:00
2009-03-30 10:39:20 +00:00
2011-06-21 20:58:39 +02:00
2008-02-08 19:17:46 +00:00
2011-03-17 17:26:45 +01:00
2010-03-05 08:34:31 +00:00
2011-01-30 03:41:47 +01:00
2010-06-27 14:31:50 +00:00
2011-07-09 21:53:59 +02:00
2009-03-03 15:35:20 +00:00