diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-10 14:21:47 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-10 14:29:17 +0400 |
| commit | 3fa4c528a92fc5c3a80ef3310b0db6ac7559296e (patch) | |
| tree | 01e5e1248f837b1508221e5eaecfc0d952022cd3 /libavcodec/proresdec_lgpl.c | |
| parent | 5c99ca2288f5415a9b6c291ed1065ee2388173bc (diff) | |
| parent | 2df7f7714a12a59d31058aba15fb1e348e36b0ab (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
prores: Error out only on surely incomplete ac_coeffs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/proresdec_lgpl.c')
| -rw-r--r-- | libavcodec/proresdec_lgpl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/proresdec_lgpl.c b/libavcodec/proresdec_lgpl.c index 71f6d08385..627f98fa1c 100644 --- a/libavcodec/proresdec_lgpl.c +++ b/libavcodec/proresdec_lgpl.c @@ -391,7 +391,7 @@ static inline int decode_ac_coeffs(GetBitContext *gb, int16_t *out, bits_left = get_bits_left(gb); if (bits_left <= 0 || (bits_left <= 8 && !show_bits(gb, bits_left))) - return AVERROR_INVALIDDATA; + return 0; run = decode_vlc_codeword(gb, ff_prores_ac_codebook[run_cb_index]); |