Changeset 124deea in ffmpeg

Timestamp:

Aug 22, 2011, 1:00:53 PM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

5b71ae2b

Parents:

aeba0583 (diff), ae60927a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (08/22/11 12:06:08)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (08/22/11 13:00:53)

Message:

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>

(No files)