summaryrefslogtreecommitdiffstats
path: root/libavcodec/h263dec.c
diff options
context:
space:
mode:
authorGarrick Meeker <gmeeker@theoryllc.com>2003-07-09 23:10:59 +0000
committerMichael Niedermayer <michaelni@gmx.at>2003-07-09 23:10:59 +0000
commitd4f5d74a54183a0198053b0ceb0faa21ad686551 (patch)
tree69655576785813053b765c0ab095e191c86c0f30 /libavcodec/h263dec.c
parentb64dcbe3254337952627098756a454f572c55480 (diff)
downloadffmpeg-streaming-d4f5d74a54183a0198053b0ceb0faa21ad686551.zip
ffmpeg-streaming-d4f5d74a54183a0198053b0ceb0faa21ad686551.tar.gz
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
Originally committed as revision 2024 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h263dec.c')
-rw-r--r--libavcodec/h263dec.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index b1eb6fd..33e21f5 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -96,6 +96,9 @@ int ff_h263_decode_init(AVCodecContext *avctx)
case CODEC_ID_H263I:
s->h263_intel = 1;
break;
+ case CODEC_ID_FLV1:
+ s->h263_flv = 1;
+ break;
default:
return -1;
}
@@ -451,6 +454,8 @@ retry:
s->low_delay=1;
} else if (s->h263_intel) {
ret = intel_h263_decode_picture_header(s);
+ } else if (s->h263_flv) {
+ ret = flv_h263_decode_picture_header(s);
} else {
ret = h263_decode_picture_header(s);
}
@@ -793,3 +798,14 @@ AVCodec h263i_decoder = {
mpeg4_decoptions,
};
+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
+};
OpenPOWER on IntegriCloud