summaryrefslogtreecommitdiff
path: root/libavcodec/aacdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-10-27 01:26:43 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-10-27 01:39:04 +0200
commit173715d2918a8b2674e2d93e74d36df037ce4409 (patch)
tree24b98c2118ba5a9e347ad2b6cdd8a7c8a53f20b6 /libavcodec/aacdec.c
parent1c5670dbb204369477ee1b5d967f9e8b4f4a33b8 (diff)
parent4a6a29a7fbf023b19797c38a86099d9f81d25524 (diff)
Merge remote-tracking branch 'qatar/master'
* qatar/master: (35 commits) libopencore-amr: check output buffer size before decoding libopencore-amr: remove unneeded buf_size==0 check. libopencore-amr: remove unneeded frame_count field. aac_latm: remove unneeded check for zero-size packet. pcmdec: fix output buffer size check by calculating the actual output size prior to decoding. pcmdec: move codec-specific variable declarations to the corresponding codec blocks. pcmdec: return buf_size instead of src-buf. avcodec: remove the Zork PCM encoder. pcm_zork: use AV_SAMPLE_FMT_U8 instead of shifting all samples by 8. pcmenc: remove unneeded sample_fmt check. pcmdec: move number of channels check to pcm_decode_init() pcmdec: remove unnecessary check for sample_fmt change pcmdec: move DVD PCM bits_per_coded_sample check near to the code that sets the sample size. pcmdec: do not needlessly set *data_size to 0 alacdec: remove unneeded NULL or zero-size packet checks. alacdec: simplify buffer allocation by using FF_ALLOC_OR_GOTO() alacdec: ask for a sample for unsupported sample depths. alacdec: cosmetics: use 'ch' instead of 'chan' to iterate channels alacdec: move some declarations to the top of the function alacdec: always use get_sbits_long() for uncompressed samples ... Conflicts: libavcodec/pcm.c tests/ref/acodec/pcm Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aacdec.c')
-rw-r--r--libavcodec/aacdec.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index 7c8d74e857..117cd587ee 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -2501,9 +2501,6 @@ static int latm_decode_frame(AVCodecContext *avctx, void *out, int *out_size,
int muxlength, err;
GetBitContext gb;
- if (avpkt->size == 0)
- return 0;
-
init_get_bits(&gb, avpkt->data, avpkt->size * 8);
// check for LOAS sync word