aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Lohmaier <cloph@openoffice.org>2007-06-04 11:03:24 +0000
committerGuillaume Poirier <gpoirier@mplayerhq.hu>2007-06-04 11:03:24 +0000
commitc11aac6cdae5708daf4fdbd88ba411b456b30fca (patch)
treed4f11a841fa525f9cb6d1cb01e237075d077daa7
parenta45ec41409636524568cfdf9a00e472b76d5faaf (diff)
downloadffmpeg-c11aac6cdae5708daf4fdbd88ba411b456b30fca.tar.gz
fix error: indeo2.c:202:1: directives may not be used inside a macro argument,
introduced when init_vlc was turned into a macro Patch by Christian Lohmaier %cloph A openoffice P org% Originally committed as revision 9198 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/indeo2.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/indeo2.c b/libavcodec/indeo2.c
index 2b129d1418..be9a93a5bb 100644
--- a/libavcodec/indeo2.c
+++ b/libavcodec/indeo2.c
@@ -197,11 +197,13 @@ static int ir2_decode_init(AVCodecContext *avctx){
avctx->pix_fmt= PIX_FMT_YUV410P;
if (!ir2_vlc.table)
+#ifdef ALT_BITSTREAM_READER_LE
init_vlc(&ir2_vlc, CODE_VLC_BITS, IR2_CODES,
&ir2_codes[0][1], 4, 2,
-#ifdef ALT_BITSTREAM_READER_LE
&ir2_codes[0][0], 4, 2, INIT_VLC_USE_STATIC | INIT_VLC_LE);
#else
+ init_vlc(&ir2_vlc, CODE_VLC_BITS, IR2_CODES,
+ &ir2_codes[0][1], 4, 2,
&ir2_codes[0][0], 4, 2, INIT_VLC_USE_STATIC);
#endif