diff options
| author | Fabrice Bellard <fabrice@bellard.org> | 2002-10-04 07:16:50 +0000 |
|---|---|---|
| committer | Fabrice Bellard <fabrice@bellard.org> | 2002-10-04 07:16:50 +0000 |
| commit | 020fcc94e09d033ab2ae1a6d908722cb074ea2ba (patch) | |
| tree | 52d2e1ae3a0e88f60af615705fbfea574d430aef | |
| parent | 5d2231ee8fed0db4a520b646e2b5149c245bc0a4 (diff) | |
| download | ffmpeg-020fcc94e09d033ab2ae1a6d908722cb074ea2ba.tar.gz | |
added DV support
Originally committed as revision 999 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libav/avienc.c | 3 | ||||
| -rw-r--r-- | libavcodec/Makefile | 2 | ||||
| -rw-r--r-- | libavcodec/allcodecs.c | 2 | ||||
| -rw-r--r-- | libavcodec/avcodec.h | 4 |
4 files changed, 10 insertions, 1 deletions
diff --git a/libav/avienc.c b/libav/avienc.c index f962bf98a3..38bef1eb46 100644 --- a/libav/avienc.c +++ b/libav/avienc.c @@ -75,6 +75,9 @@ CodecTag codec_bmp_tags[] = { { CODEC_ID_MSMPEG4V2, MKTAG('M', 'P', '4', '2') }, { CODEC_ID_MSMPEG4V1, MKTAG('M', 'P', 'G', '4') }, { CODEC_ID_WMV1, MKTAG('W', 'M', 'V', '1') }, + { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 's', 'l') }, + { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 's', 'd') }, + { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', 'd') }, { 0, 0 }, }; diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 08aa1e31ce..f180de2277 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -15,7 +15,7 @@ OBJS= common.o utils.o mem.o allcodecs.o \ mpegaudio.o ac3enc.o mjpeg.o resample.o dsputil.o \ motion_est.o imgconvert.o imgresample.o msmpeg4.o \ mpeg12.o h263dec.o svq1.o rv10.o mpegaudiodec.o pcm.o simple_idct.o \ - ratecontrol.o adpcm.o eval.o + ratecontrol.o adpcm.o eval.o dv.o ASM_OBJS= # currently using liba52 for ac3 decoding diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 39724d24e2..82bd6c6d0e 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -69,6 +69,8 @@ void avcodec_register_all(void) register_avcodec(&h263i_decoder); register_avcodec(&rv10_decoder); register_avcodec(&svq1_decoder); + register_avcodec(&dvvideo_decoder); + // register_avcodec(&dvaudio_decoder); register_avcodec(&mjpeg_decoder); register_avcodec(&mp2_decoder); register_avcodec(&mp3_decoder); diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index d7a8fb0fd8..c4baf7f968 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -28,6 +28,8 @@ enum CodecID { CODEC_ID_H263P, CODEC_ID_H263I, CODEC_ID_SVQ1, + CODEC_ID_DVVIDEO, + CODEC_ID_DVAUDIO, /* various pcm "codecs" */ CODEC_ID_PCM_S16LE, @@ -812,6 +814,8 @@ extern AVCodec mpeg_decoder; extern AVCodec h263i_decoder; extern AVCodec rv10_decoder; extern AVCodec svq1_decoder; +extern AVCodec dvvideo_decoder; +extern AVCodec dvaudio_decoder; extern AVCodec mjpeg_decoder; extern AVCodec mp2_decoder; extern AVCodec mp3_decoder; |