diff options
| author | Mike Melanson <mike@multimedia.cx> | 2004-03-09 04:09:41 +0000 |
|---|---|---|
| committer | Mike Melanson <mike@multimedia.cx> | 2004-03-09 04:09:41 +0000 |
| commit | 9c4ee906d1cc4487be898342d07690f207e35f90 (patch) | |
| tree | 9aaf002f89bb6231ca44e19ef529241249aa7408 /src/libffmpeg/video_decoder.c | |
| parent | a4940f08b672530a217518d1fbcea4c2ea2428db (diff) | |
| download | xine-lib-9c4ee906d1cc4487be898342d07690f207e35f90.tar.gz xine-lib-9c4ee906d1cc4487be898342d07690f207e35f90.tar.bz2 | |
hook up ffmpeg's Flash Video support
CVS patchset: 6237
CVS date: 2004/03/09 04:09:41
Diffstat (limited to 'src/libffmpeg/video_decoder.c')
| -rw-r--r-- | src/libffmpeg/video_decoder.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/libffmpeg/video_decoder.c b/src/libffmpeg/video_decoder.c index 916bfc956..cbf080052 100644 --- a/src/libffmpeg/video_decoder.c +++ b/src/libffmpeg/video_decoder.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_decoder.c,v 1.9 2004/03/03 20:09:13 mroi Exp $ + * $Id: video_decoder.c,v 1.10 2004/03/09 04:09:41 tmmm Exp $ * * xine video decoder plugin using ffmpeg * @@ -790,7 +790,8 @@ static const ff_codec_t ff_video_lookup[] = { {BUF_VIDEO_MSZH, CODEC_ID_MSZH, "MSZH Video (ffmpeg)"}, {BUF_VIDEO_ASV1, CODEC_ID_ASV1, "ASV v1 Video (ffmpeg)"}, {BUF_VIDEO_ASV2, CODEC_ID_ASV2, "ASV v2 Video (ffmpeg)"}, - {BUF_VIDEO_ATIVCR1, CODEC_ID_VCR1, "ATI VCR-1 (ffmpeg)"} }; + {BUF_VIDEO_ATIVCR1, CODEC_ID_VCR1, "ATI VCR-1 (ffmpeg)"}, + {BUF_VIDEO_FLV1, CODEC_ID_FLV1, "Flash Video (ffmpeg)"} }; static void ff_decode_data (video_decoder_t *this_gen, buf_element_t *buf) { ff_video_decoder_t *this = (ff_video_decoder_t *) this_gen; @@ -1268,6 +1269,7 @@ static uint32_t supported_video_types[] = { BUF_VIDEO_ASV1, BUF_VIDEO_ASV2, BUF_VIDEO_ATIVCR1, + BUF_VIDEO_FLV1, 0 }; |