ffmpeg/libavformat
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-31 19:40:08 +02:00
2011-05-15 03:25:57 +02:00
2011-04-17 23:43:54 +02:00
2011-08-14 00:05:36 +02:00
2011-04-04 02:15:12 +02:00
2011-08-01 00:58:49 +02:00
2011-07-24 23:52:42 +02:00
2011-04-09 03:17:07 +02:00
2011-08-09 19:56:25 +02:00
2011-08-09 19:56:25 +02:00
2011-08-09 19:56:25 +02:00
2011-05-05 03:30:24 +02:00
2011-04-21 03:37:05 +02:00
2011-04-09 03:17:07 +02:00
2011-04-07 03:32:26 +02:00
2011-04-07 03:32:26 +02:00
2011-04-20 04:48:23 +02:00
2011-04-04 01:29:40 +02:00
2011-04-04 01:29:40 +02:00
2011-04-20 04:48:23 +02:00
2011-08-09 19:56:25 +02:00
2011-08-15 00:40:54 +02:00
2011-06-02 20:06:00 +01:00
2011-04-04 02:15:12 +02:00
2011-04-24 03:41:22 +02:00
2011-04-24 03:41:22 +02:00
2011-08-01 00:58:49 +02:00
2011-05-30 02:39:26 +02:00
2011-05-01 21:13:18 +02:00