summaryrefslogtreecommitdiff
path: root/libavformat/rawdec.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-09-14 14:03:55 +0200
committerAnton Khirnov <anton@khirnov.net>2011-09-17 06:43:09 +0200
commit85d982f1e2c3efb8d5622caea162cede3f6c0e21 (patch)
treec00eae3f3d7781e8fb1eb173fb3a86a0cfd21e73 /libavformat/rawdec.c
parent34d2bf30a082d489487493df40496cc18ca4300b (diff)
rawdec: refactor private option for raw video demuxers
pixel_format/video_size only apply to 'rawvideo' (==uncompressed) demuxer and make no sense for the other raw (== containerless) demuxers. Keep only the framerate option for those. Also use unique classes for all raw video demuxers
Diffstat (limited to 'libavformat/rawdec.c')
-rw-r--r--libavformat/rawdec.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/libavformat/rawdec.c b/libavformat/rawdec.c
index 0b9a0824ff..35df5e2462 100644
--- a/libavformat/rawdec.c
+++ b/libavformat/rawdec.c
@@ -169,21 +169,10 @@ fail:
#define OFFSET(x) offsetof(FFRawVideoDemuxerContext, x)
#define DEC AV_OPT_FLAG_DECODING_PARAM
-static const AVOption video_options[] = {
- { "video_size", "A string describing frame size, such as 640x480 or hd720.", OFFSET(video_size), FF_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC },
- { "pixel_format", "", OFFSET(pixel_format), FF_OPT_TYPE_STRING, {.str = "yuv420p"}, 0, 0, DEC },
- { "framerate", "", OFFSET(framerate), FF_OPT_TYPE_STRING, {.str = "25"}, 0, 0, DEC },
+const AVOption ff_rawvideo_options[] = {
+ { "framerate", "", OFFSET(framerate), FF_OPT_TYPE_STRING, {.str = "25"}, 0, 0, DEC},
{ NULL },
};
-#undef OFFSET
-#undef DEC
-
-const AVClass ff_rawvideo_demuxer_class = {
- .class_name = "rawvideo demuxer",
- .item_name = av_default_item_name,
- .option = video_options,
- .version = LIBAVUTIL_VERSION_INT,
-};
#if CONFIG_G722_DEMUXER
AVInputFormat ff_g722_demuxer = {