FFmpeg/libavcodec
Michael Niedermayer 124deea1a0 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  libx264: only use ABR mode when the user explicitly set bitrate.
  libx264: use medium preset by default.
  mp2 encoder: make 128k the default bitrate.
  movenc: use libx264 by default when possible for mov, mp4 and psp
  avienc: saner default audio codec.
  matroskaenc: saner default codecs.
  avplay: add examples of how to specify size/pixel format through private options
  lavc: add A|E|D flags to "ac" and "ar" options

Conflicts:
	doc/ffplay.texi
	libavcodec/libx264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-22 15:00:53 +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-20 00:38:26 +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
2011-06-21 13:17:10 +02:00