diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2010-01-07 05:36:45 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2010-01-07 05:36:45 +0000 |
| commit | a0b0d75368c603671379de73993404955ca96079 (patch) | |
| tree | 4a802b5bdaefbc7382a47e8011184d3942492bb3 /libavcodec/h263dec.c | |
| parent | eb52376915cb518220264962fdbcf22418e790bb (diff) | |
| download | ffmpeg-a0b0d75368c603671379de73993404955ca96079.tar.gz | |
Split flv decoding out.
Originally committed as revision 21051 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h263dec.c')
| -rw-r--r-- | libavcodec/h263dec.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 8a903f2fb2..dda414d504 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -33,6 +33,7 @@ #include "mpeg4video_parser.h" #include "msmpeg4.h" #include "vdpau_internal.h" +#include "flv.h" //#define DEBUG //#define PRINT_FRAME_TIME @@ -414,8 +415,8 @@ retry: ret = ff_mpeg4_decode_picture_header(s, &s->gb); } else if (s->codec_id == CODEC_ID_H263I) { ret = intel_h263_decode_picture_header(s); - } else if (s->h263_flv) { - ret = flv_h263_decode_picture_header(s); + } else if (CONFIG_FLV_DECODER && s->h263_flv) { + ret = ff_flv_decode_picture_header(s); } else { ret = h263_decode_picture_header(s); } @@ -830,20 +831,6 @@ AVCodec h263i_decoder = { .pix_fmts= ff_pixfmt_list_420, }; -AVCodec flv_decoder = { - "flv", - CODEC_TYPE_VIDEO, - CODEC_ID_FLV1, - sizeof(MpegEncContext), - ff_h263_decode_init, - NULL, - ff_h263_decode_end, - ff_h263_decode_frame, - CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1, - .long_name= NULL_IF_CONFIG_SMALL("Flash Video (FLV) / Sorenson Spark / Sorenson H.263"), - .pix_fmts= ff_pixfmt_list_420, -}; - #if CONFIG_MPEG4_VDPAU_DECODER AVCodec mpeg4_vdpau_decoder = { "mpeg4_vdpau", |