diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-22 14:06:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-22 15:00:53 +0200 |
| commit | 124deea1a0ccc4296cc6021231a7e6fbf336ff3a (patch) | |
| tree | 95db44e4e9ed969674f9dbb194a999c8150a1e03 /libavcodec/x86/vp56_arith.h | |
| parent | aeba058340ec47a10049c9cefb7ca8d500047b31 (diff) | |
| parent | ae60927aefe7a9debc285451b2badf1b8eb5ab22 (diff) | |
| download | ffmpeg-124deea1a0ccc4296cc6021231a7e6fbf336ff3a.tar.gz | |
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>
Diffstat (limited to 'libavcodec/x86/vp56_arith.h')
0 files changed, 0 insertions, 0 deletions