[SCM] libav/experimental: Misplaced #ifdef, the MMFContext struct is needed outside CONFIG_ENCODERS.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:45:09 UTC 2013
The following commit has been merged in the experimental branch:
commit 4bc113a93730f614e2bfee6919e6d8830efd09e3
Author: Diego Biurrun <diego at biurrun.de>
Date: Tue Sep 20 23:52:29 2005 +0000
Misplaced #ifdef, the MMFContext struct is needed outside CONFIG_ENCODERS.
Originally committed as revision 4604 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavformat/mmf.c b/libavformat/mmf.c
index 82d7017..177f2df 100644
--- a/libavformat/mmf.c
+++ b/libavformat/mmf.c
@@ -19,12 +19,12 @@
#include "avformat.h"
#include "avi.h"
-#ifdef CONFIG_ENCODERS
typedef struct {
offset_t atrpos, atsqpos, awapos;
offset_t data_size;
} MMFContext;
+#ifdef CONFIG_ENCODERS
static int mmf_rates[] = { 4000, 8000, 11025, 22050, 44100 };
static int mmf_rate_code(int rate)
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list