[FFmpeg-cvslog] dca: return error if the frame header is invalid

[Justin Ruggles]

ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Thu Oct 27 11:42:23 2011 -0400| [aae6eead6a6e9bbab1c808d7552da5631ac78576] | committer: Justin Ruggles

dca: return error if the frame header is invalid

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=aae6eead6a6e9bbab1c808d7552da5631ac78576
---

 libavcodec/dca.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/libavcodec/dca.c b/libavcodec/dca.c
index 518fd30..deb7245 100644
--- a/libavcodec/dca.c
+++ b/libavcodec/dca.c
@@ -1637,7 +1637,7 @@ static int dca_decode_frame(AVCodecContext * avctx,
 
     int lfe_samples;
     int num_core_channels = 0;
-    int i;
+    int i, ret;
     float   *samples_flt = data;
     int16_t *samples_s16 = data;
     int out_size;
@@ -1656,10 +1656,9 @@ static int dca_decode_frame(AVCodecContext * avctx,
     }
 
     init_get_bits(&s->gb, s->dca_buffer, s->dca_buffer_size * 8);
-    if (dca_parse_frame_header(s) < 0) {
+    if ((ret = dca_parse_frame_header(s)) < 0) {
         //seems like the frame is corrupt, try with the next one
-        *data_size=0;
-        return buf_size;
+        return ret;
     }
     //set AVCodec values with parsed data
     avctx->sample_rate = s->sample_rate;