diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-01 00:36:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-01 00:36:43 +0200 |
| commit | 2f7bd3b5162c240e62c11cf0373342fa89f26c8f (patch) | |
| tree | 1d0f0aeb6b2c6acc811f11eca9fbeb16c451ea2c /libavcodec/pcm-mpeg.c | |
| parent | 5216245a2c5ed8140d99f14fcc148fbb6db9831e (diff) | |
| parent | 420d1df2e2a857eae45fa947e16eae7494793d57 (diff) | |
| download | ffmpeg-2f7bd3b5162c240e62c11cf0373342fa89f26c8f.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
apedec: check bits <= 32.
cavs: Remove unused code.
oggenc: fix condition when not to flush due to keyframe granule.
oggenc: add pagesize option to set preferred page size
libspeexdec: set frame size in libspeex_decode_init()
smacker audio: sign-extend the initial 16-bit predicted value
Conflicts:
libavcodec/apedec.c
libavcodec/libspeexdec.c
libavformat/oggenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pcm-mpeg.c')
0 files changed, 0 insertions, 0 deletions