diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-19 02:11:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-19 02:34:18 +0100 |
| commit | 7c29313b387392fa305365e855fa408cd28c276e (patch) | |
| tree | 328f30ad4a4e6b606bbbffc1f15f22d2044affb3 /libavformat/amr.c | |
| parent | f371396dfb95c116a05e9b9f690fa916bb2d815e (diff) | |
| parent | 2a216ca2ef29282cac9003a716b469b8c80c0a15 (diff) | |
| download | ffmpeg-streaming-7c29313b387392fa305365e855fa408cd28c276e.zip ffmpeg-streaming-7c29313b387392fa305365e855fa408cd28c276e.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
APIchanges: fill in revision for AVFrame.age deprecation
avcodec: deprecate AVFrame.age
4xm: remove unneeded check for remaining unused data.
lavf: force threads to 1 in avformat_find_stream_info()
swscale: fix overflows in vertical scaling at top/bottom edges.
lavf: add OpenMG audio muxer.
omadec: split data that will be used in the muxer to a separate file.
lavf: rename oma.c -> omadec.c
tmv decoder: set correct pix_fmt
Conflicts:
Changelog
doc/APIchanges
libavcodec/mpegvideo.c
libavcodec/version.h
libavformat/oma.c
libavformat/version.h
libswscale/swscale.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/amr.c')
0 files changed, 0 insertions, 0 deletions
