diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-05-25 08:14:13 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-05-27 08:31:16 +0200 |
| commit | fa4924a35818b2564050119ed7c14cbdd2b56065 (patch) | |
| tree | f63b4545f25fd2a7e48e3b48ef8d523eee6a7fda /libavformat/rawdec.c | |
| parent | 4779f59378d54f30644ef79ce3a5c402546f3cb9 (diff) | |
| download | ffmpeg-fa4924a35818b2564050119ed7c14cbdd2b56065.tar.gz | |
rawdec: factor video demuxer definitions into a macro.
Diffstat (limited to 'libavformat/rawdec.c')
| -rw-r--r-- | libavformat/rawdec.c | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/libavformat/rawdec.c b/libavformat/rawdec.c index 265822b2da..434ed48f05 100644 --- a/libavformat/rawdec.c +++ b/libavformat/rawdec.c @@ -229,17 +229,7 @@ AVInputFormat ff_gsm_demuxer = { #endif #if CONFIG_MJPEG_DEMUXER -AVInputFormat ff_mjpeg_demuxer = { - "mjpeg", - NULL_IF_CONFIG_SMALL("raw MJPEG video"), - 0, - NULL, - ff_raw_video_read_header, - ff_raw_read_partial_packet, - .flags= AVFMT_GENERIC_INDEX, - .extensions = "mjpg,mjpeg", - .value = CODEC_ID_MJPEG, -}; +FF_DEF_RAWVIDEO_DEMUXER(mjpeg, "raw MJPEG video", NULL, "mjpg,mjpeg", CODEC_ID_MJPEG) #endif #if CONFIG_MLP_DEMUXER @@ -285,14 +275,5 @@ AVInputFormat ff_shorten_demuxer = { #endif #if CONFIG_VC1_DEMUXER -AVInputFormat ff_vc1_demuxer = { - "vc1", - NULL_IF_CONFIG_SMALL("raw VC-1"), - 0, - NULL /* vc1_probe */, - ff_raw_video_read_header, - ff_raw_read_partial_packet, - .extensions = "vc1", - .value = CODEC_ID_VC1, -}; +FF_DEF_RAWVIDEO_DEMUXER(vc1, "raw VC-1", NULL, "vc1", CODEC_ID_VC1) #endif |