1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00
FFmpeg/libavcodec
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-08-15 06:14:40 +02:00
2011-08-15 00:39:55 +02:00
2011-08-12 17:20:57 +02:00
2011-08-15 00:39:55 +02:00
2011-08-15 00:39:55 +02:00
2011-08-15 00:39:55 +02:00
2011-08-15 00:39:55 +02:00
2011-08-15 00:39:55 +02:00
2011-08-15 00:39:55 +02:00
2011-08-15 00:39:55 +02:00
2011-08-15 00:39:55 +02:00
2011-08-15 00:39:55 +02:00
2011-07-21 18:10:58 +01:00
2011-08-09 15:08:20 +02:00
2011-08-01 01:26:55 +02:00
2011-08-15 00:39:55 +02:00
2011-08-16 23:07:25 +02:00
2011-08-16 23:07:25 +02:00
2011-08-15 00:39:55 +02:00