[SCM] libav/experimental: mlp: Define End-of-Stream code in common header file and use it in decoder.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:27:36 UTC 2013


The following commit has been merged in the experimental branch:
commit 1e8bd10c579615dde74fe02c797cc4beeeb29ad1
Author: Ramiro Polla <ramiro.polla at gmail.com>
Date:   Thu Aug 14 19:38:39 2008 +0000

    mlp: Define End-of-Stream code in common header file and use it in decoder.
    
    Originally committed as revision 14763 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mlp.h b/libavcodec/mlp.h
index a434cd1..bbb09e0 100644
--- a/libavcodec/mlp.h
+++ b/libavcodec/mlp.h
@@ -56,6 +56,9 @@
 */
 #define MAX_FILTER_ORDER    8
 
+/** Code that signals end of a stream. */
+#define END_OF_STREAM       0xd234d234
+
 #define FIR 0
 #define IIR 1
 
diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c
index 421abde..7272458 100644
--- a/libavcodec/mlpdec.c
+++ b/libavcodec/mlpdec.c
@@ -990,7 +990,7 @@ static int read_access_unit(AVCodecContext *avctx, void* data, int *data_size,
 
         skip_bits(&gb, (-get_bits_count(&gb)) & 15);
         if (substream_data_len[substr] * 8 - get_bits_count(&gb) >= 32 &&
-            (show_bits_long(&gb, 32) == 0xd234d234 ||
+            (show_bits_long(&gb, 32) == END_OF_STREAM ||
              show_bits_long(&gb, 20) == 0xd234e)) {
             skip_bits(&gb, 18);
             if (substr == m->max_decoded_substream)

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list