@@ -305,7 +305,7 @@ OBJS-$(CONFIG_PNM_PARSER)              += pnm_parser.o pnm.o

 OBJS-$(CONFIG_VC1_PARSER)              += vc1_parser.o

 OBJS-$(CONFIG_DUMP_EXTRADATA_BSF)      += bitstream_filter.o

-OBJS-$(CONFIG_REMOVE_EXTRADATA_BSF)    += bitstream_filter.o

+OBJS-$(CONFIG_REMOVE_EXTRADATA_BSF)    += remove_extradata_bsf.o

 OBJS-$(CONFIG_NOISE_BSF)               += noise_bsf.o

 OBJS-$(CONFIG_MP3_HEADER_COMPRESS_BSF) += mp3_header_compress_bsf.o

 OBJS-$(CONFIG_MP3_HEADER_DECOMPRESS_BSF) += mp3_header_decompress_bsf.o mpegaudiodata.o

@@ -79,33 +79,6 @@ static int dump_extradata(AVBitStreamFilterContext *bsfc, AVCodecContext *avctx,

     return 0;

 }

-static int remove_extradata(AVBitStreamFilterContext *bsfc, AVCodecContext *avctx, const char *args,

-                     uint8_t **poutbuf, int *poutbuf_size,

-                     const uint8_t *buf, int buf_size, int keyframe){

-    int cmd= args ? *args : 0;

-    AVCodecParserContext *s;

-

-    if(!bsfc->parser){

-        bsfc->parser= av_parser_init(avctx->codec_id);

-    }

-    s= bsfc->parser;

-

-    if(s && s->parser->split){

-        if(  (((avctx->flags & CODEC_FLAG_GLOBAL_HEADER) || (avctx->flags2 & CODEC_FLAG2_LOCAL_HEADER)) && cmd=='a')

-           ||(!keyframe && cmd=='k')

-           ||(cmd=='e' || !cmd)

-          ){

-            int i= s->parser->split(avctx, buf, buf_size);

-            buf += i;

-            buf_size -= i;

-        }

-    }

-    *poutbuf= (uint8_t *) buf;

-    *poutbuf_size= buf_size;

-

-    return 0;

-}

-

 #ifdef CONFIG_DUMP_EXTRADATA_BSF

 AVBitStreamFilter dump_extradata_bsf={

     "dump_extra",

@@ -113,11 +86,3 @@ AVBitStreamFilter dump_extradata_bsf={

     dump_extradata,

 };

 #endif

-

-#ifdef CONFIG_REMOVE_EXTRADATA_BSF

-AVBitStreamFilter remove_extradata_bsf={

-    "remove_extra",

-    0,

-    remove_extradata,

-};

-#endif

new file mode 100644

@@ -0,0 +1,55 @@

+/*

+ * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>

+ *

+ * This file is part of FFmpeg.

+ *

+ * FFmpeg is free software; you can redistribute it and/or

+ * modify it under the terms of the GNU Lesser General Public

+ * License as published by the Free Software Foundation; either

+ * version 2.1 of the License, or (at your option) any later version.

+ *

+ * FFmpeg is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+ * Lesser General Public License for more details.

+ *

+ * You should have received a copy of the GNU Lesser General Public

+ * License along with FFmpeg; if not, write to the Free Software

+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

+ */

+

+#include "avcodec.h"

+

+

+static int remove_extradata(AVBitStreamFilterContext *bsfc, AVCodecContext *avctx, const char *args,

+                     uint8_t **poutbuf, int *poutbuf_size,

+                     const uint8_t *buf, int buf_size, int keyframe){

+    int cmd= args ? *args : 0;

+    AVCodecParserContext *s;

+

+    if(!bsfc->parser){

+        bsfc->parser= av_parser_init(avctx->codec_id);

+    }

+    s= bsfc->parser;

+

+    if(s && s->parser->split){

+        if(  (((avctx->flags & CODEC_FLAG_GLOBAL_HEADER) || (avctx->flags2 & CODEC_FLAG2_LOCAL_HEADER)) && cmd=='a')

+           ||(!keyframe && cmd=='k')

+           ||(cmd=='e' || !cmd)

+          ){

+            int i= s->parser->split(avctx, buf, buf_size);

+            buf += i;

+            buf_size -= i;

+        }

+    }

+    *poutbuf= (uint8_t *) buf;

+    *poutbuf_size= buf_size;

+

+    return 0;

+}

+

+AVBitStreamFilter remove_extradata_bsf={

+    "remove_extra",

+    0,

+    remove_extradata,

+};