[SCM] libav/experimental: make compression_type a function local var instead of a context var

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


The following commit has been merged in the experimental branch:
commit e5d34ab6d0e4d931f25d6c30dd9d648ea261addc
Author: Aurelien Jacobs <aurel at gnuage.org>
Date:   Thu Oct 18 22:47:56 2007 +0000

    make compression_type a function local var instead of a context var
    
    Originally committed as revision 10796 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/electronicarts.c b/libavformat/electronicarts.c
index 6392019..3465f1c 100644
--- a/libavformat/electronicarts.c
+++ b/libavformat/electronicarts.c
@@ -54,7 +54,6 @@ typedef struct EaDemuxContext {
 
     int num_channels;
     int num_samples;
-    int compression_type;
 } EaDemuxContext;
 
 static uint32_t read_arbitary(ByteIOContext *pb) {
@@ -83,6 +82,7 @@ static int process_audio_header_elements(AVFormatContext *s)
     int inHeader = 1;
     EaDemuxContext *ea = s->priv_data;
     ByteIOContext *pb = &s->pb;
+    int compression_type;
 
     ea->num_channels = 1;
 
@@ -105,8 +105,8 @@ static int process_audio_header_elements(AVFormatContext *s)
                     av_log (s, AV_LOG_INFO, "num_channels (element 0x82) set to 0x%08x\n", ea->num_channels);
                     break;
                 case 0x83:
-                    ea->compression_type = read_arbitary(pb);
-                    av_log (s, AV_LOG_INFO, "compression_type (element 0x83) set to 0x%08x\n", ea->compression_type);
+                    compression_type = read_arbitary(pb);
+                    av_log (s, AV_LOG_INFO, "compression_type (element 0x83) set to 0x%08x\n", compression_type);
                     break;
                 case 0x85:
                     ea->num_samples = read_arbitary(pb);

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list