diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-10-03 19:14:03 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-10-05 07:52:30 +0200 |
| commit | a4ea00d021b2bda1b641a2f00c167cadedfe9d4c (patch) | |
| tree | 9518f4e1b6de886ca7cf805d5c7f79901109f16d /libavformat/img2.c | |
| parent | 0ba1e1978d4016df42ed481a832e7539ebc48220 (diff) | |
| download | ffmpeg-a4ea00d021b2bda1b641a2f00c167cadedfe9d4c.tar.gz | |
lavc/lavf: use unique private classes.
This is needed by the new AVOptions API.
Diffstat (limited to 'libavformat/img2.c')
| -rw-r--r-- | libavformat/img2.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/libavformat/img2.c b/libavformat/img2.c index 935d763288..354b38e031 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -458,15 +458,14 @@ static const AVOption options[] = { { NULL }, }; +/* input */ +#if CONFIG_IMAGE2_DEMUXER static const AVClass img2_class = { .class_name = "image2 demuxer", .item_name = av_default_item_name, .option = options, .version = LIBAVUTIL_VERSION_INT, }; - -/* input */ -#if CONFIG_IMAGE2_DEMUXER AVInputFormat ff_image2_demuxer = { .name = "image2", .long_name = NULL_IF_CONFIG_SMALL("image2 sequence"), @@ -479,13 +478,19 @@ AVInputFormat ff_image2_demuxer = { }; #endif #if CONFIG_IMAGE2PIPE_DEMUXER +static const AVClass img2pipe_class = { + .class_name = "image2pipe demuxer", + .item_name = av_default_item_name, + .option = options, + .version = LIBAVUTIL_VERSION_INT, +}; AVInputFormat ff_image2pipe_demuxer = { .name = "image2pipe", .long_name = NULL_IF_CONFIG_SMALL("piped image2 sequence"), .priv_data_size = sizeof(VideoData), .read_header = read_header, .read_packet = read_packet, - .priv_class = &img2_class, + .priv_class = &img2pipe_class, }; #endif |