Simplify ptr[0]; ptr++; to *ptr++

[ffmpeg] / libavcodec / a52dec.c

diff --git a/libavcodec/a52dec.c b/libavcodec/a52dec.c
index e810bc7d77c39b6c31c56a6120d95d488c5eee98..c2da2283d9d8ed0569fd316efd32996f12c7820a 100644 (file)
--- a/libavcodec/a52dec.c
+++ b/libavcodec/a52dec.c
@@ -1,5 +1,5 @@
 /*
- * A52 decoder
+ * A52 decoder using liba52
  * Copyright (c) 2001 Fabrice Bellard.
  *
  * This file is part of FFmpeg.
@@ -21,11 +21,11 @@
 
 /**
  * @file a52dec.c
- * A52 decoder.
+ * A52 decoder using liba52
  */
 
 #include "avcodec.h"
-#include "liba52/a52.h"
+#include <a52dec/a52.h>
 
 #ifdef CONFIG_LIBA52BIN
 #include <dlfcn.h>
@@ -104,7 +104,6 @@ static int a52_decode_init(AVCodecContext *avctx)
         return -1;
     }
 #else
-    /* static linked version */
     s->handle = 0;
     s->a52_init = a52_init;
     s->a52_samples = a52_samples;
@@ -162,6 +161,8 @@ static int a52_decode_frame(AVCodecContext *avctx,
         2, 1, 2, 3, 3, 4, 4, 5
     };
 
+    *data_size= 0;
+
     buf_ptr = buf;
     while (buf_size > 0) {
         len = s->inbuf_ptr - s->inbuf;
@@ -217,6 +218,7 @@ static int a52_decode_frame(AVCodecContext *avctx,
             level = 1;
             if (s->a52_frame(s->state, s->inbuf, &flags, &level, 384)) {
             fail:
+                av_log(avctx, AV_LOG_ERROR, "Error decoding frame\n");
                 s->inbuf_ptr = s->inbuf;
                 s->frame_size = 0;
                 continue;
@@ -245,7 +247,7 @@ static int a52_decode_end(AVCodecContext *avctx)
     return 0;
 }
 
-AVCodec ac3_decoder = {
+AVCodec liba52_decoder = {
     "ac3",
     CODEC_TYPE_AUDIO,
     CODEC_ID_AC3,