diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-02-28 03:38:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-02-28 03:38:58 +0100 |
| commit | e3822886ebb3ae97bdae9be264d891f1d35c960b (patch) | |
| tree | 0debfb9843f9a8b56454a1bbe9b679827e9c2615 /ffpresets/libvpx-1080p.ffpreset | |
| parent | f1808e304834304122ebce9325eb997a673a9dc2 (diff) | |
| parent | d10319d87f7f408dc69e1540498e87e2860e945d (diff) | |
| download | ffmpeg-e3822886ebb3ae97bdae9be264d891f1d35c960b.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avcodec_default_reget_buffer(): fix compilation in DEBUG mode
fate: Overhaul WavPack coverage
h264: fix mmxext chroma deblock to use correct TC values.
flvdec: Remove the now redundant check for known broken metadata creator
flvdec: Validate index entries added from metadata while reading
rtsp: Handle requests from server to client
movenc: use timestamps instead of frame_size for samples-per-packet
movenc: use the first cluster duration as the tfhd default duration
movenc: factorize calculation of cluster duration into a separate function
doc/APIchanges: fill in missing dates and hashes.
lavc: reorder AVCodecContext fields.
lavc: reorder AVFrame fields.
Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavformat/flvdec.c
libavformat/movenc.c
tests/fate/lossless-audio.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffpresets/libvpx-1080p.ffpreset')
0 files changed, 0 insertions, 0 deletions