[SCM] libav/experimental: CONFIG_ENCODERS fix by (Ronald Bultje <rbultje at ronald dot bitfreak dot net>)

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:38:59 UTC 2013


The following commit has been merged in the experimental branch:
commit 8a05bca46caa937e4fa891391126639410093262
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sat Jan 17 22:02:07 2004 +0000

    CONFIG_ENCODERS fix by (Ronald Bultje <rbultje at ronald dot bitfreak dot net>)
    
    Originally committed as revision 2711 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c
index 447b6d4..07d6b92 100644
--- a/libavformat/mpeg.c
+++ b/libavformat/mpeg.c
@@ -74,13 +74,13 @@ typedef struct {
 #define AC3_ID   0x80
 #define LPCM_ID  0xa0
 
+static const int lpcm_freq_tab[4] = { 48000, 96000, 44100, 32000 };
+
 #ifdef CONFIG_ENCODERS
 extern AVOutputFormat mpeg1system_mux;
 extern AVOutputFormat mpeg1vcd_mux;
 extern AVOutputFormat mpeg2vob_mux;
 
-static const int lpcm_freq_tab[4] = { 48000, 96000, 44100, 32000 };
-
 static int put_pack_header(AVFormatContext *ctx, 
                            uint8_t *buf, int64_t timestamp)
 {

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list