diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-18 15:06:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-18 15:06:43 +0200 |
| commit | 4cdc337b5da22ff30335a9de424a1510e9b3fe49 (patch) | |
| tree | c898dea5b42d58d367583518ab22c91a4b388276 /libavcodec/bytestream.h | |
| parent | 91af76099e0649a26a411d3f704a826840006296 (diff) | |
| parent | 6a08955c104450dfc8f56aa9f552a4c08f8d8f7f (diff) | |
| download | ffmpeg-4cdc337b5da22ff30335a9de424a1510e9b3fe49.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
flvenc: silence bogus warning
configure: include flags in nm variable
alsdec: fix misplaced parentheses.
alsdec: check return values.
alsdec: fix number of decoded samples in first sub-block in BGMC mode.
alsdec: Fix out of ltp_gain_values read.
alsdec: Check that quantized parcor coeffs are within range.
alsdec: check opt_order.
Conflicts:
configure
libavcodec/alsdec.c
libavformat/flvenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/bytestream.h')
0 files changed, 0 insertions, 0 deletions