diff options
| author | Stefan Gehrer <stefan.gehrer@gmx.de> | 2006-11-12 20:18:07 +0000 |
|---|---|---|
| committer | Stefan Gehrer <stefan.gehrer@gmx.de> | 2006-11-12 20:18:07 +0000 |
| commit | 53aa68b3290533eeaae7812ad1c30de5f783e9f6 (patch) | |
| tree | e8e79db08353011f86184bfe93b1c151b562f2d6 /libavcodec/parser.c | |
| parent | 55fde95e3bfc0e337a482e2508c3ce60009d8c7b (diff) | |
move all cavs-parsing to cavs.c
This should help building parser without decoder
Originally committed as revision 6993 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/parser.c')
| -rw-r--r-- | libavcodec/parser.c | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/libavcodec/parser.c b/libavcodec/parser.c index 63a1a60944..72a3e55a3a 100644 --- a/libavcodec/parser.c +++ b/libavcodec/parser.c @@ -361,32 +361,6 @@ static int mpeg4video_parse(AVCodecParserContext *s, } #endif -#ifdef CONFIG_CAVSVIDEO_PARSER -static int cavsvideo_parse(AVCodecParserContext *s, - AVCodecContext *avctx, - uint8_t **poutbuf, int *poutbuf_size, - const uint8_t *buf, int buf_size) -{ - ParseContext *pc = s->priv_data; - int next; - - if(s->flags & PARSER_FLAG_COMPLETE_FRAMES){ - next= buf_size; - }else{ - next= ff_cavs_find_frame_end(pc, buf, buf_size); - - if (ff_combine_frame(pc, next, (uint8_t **)&buf, &buf_size) < 0) { - *poutbuf = NULL; - *poutbuf_size = 0; - return buf_size; - } - } - *poutbuf = (uint8_t *)buf; - *poutbuf_size = buf_size; - return next; -} -#endif /* CONFIG_CAVSVIDEO_PARSER */ - int ff_mpeg4video_split(AVCodecContext *avctx, const uint8_t *buf, int buf_size) { @@ -857,16 +831,6 @@ AVCodecParser mpeg4video_parser = { ff_mpeg4video_split, }; #endif -#ifdef CONFIG_CAVSVIDEO_PARSER -AVCodecParser cavsvideo_parser = { - { CODEC_ID_CAVS }, - sizeof(ParseContext1), - NULL, - cavsvideo_parse, - ff_parse1_close, - ff_mpeg4video_split, -}; -#endif #ifdef CONFIG_MPEGAUDIO_PARSER AVCodecParser mpegaudio_parser = { { CODEC_ID_MP2, CODEC_ID_MP3 }, |