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-07-04 18:33:04 +01:00
2011-07-14 18:22:36 +02:00
2011-05-20 13:50:52 +01:00
2011-08-01 11:36:16 +02:00
2011-05-12 04:51:24 +02:00
2011-04-29 18:08:46 +02:00