diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-06 03:42:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-06 03:42:14 +0200 |
| commit | 6638207bce4eabd3f99295c1ab096d2815eff3ce (patch) | |
| tree | 7ffc8358858c6628812a7514dc6e11d02083b2e2 /libavformat/img2.c | |
| parent | 2c1c0c5024f8e82200874762cbeeda494875b7e3 (diff) | |
| parent | e83c2ddebf8ee90086d8e34de9c8ba245f548f89 (diff) | |
| download | ffmpeg-6638207bce4eabd3f99295c1ab096d2815eff3ce.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Fix 'heigth' vs. 'height' typos.
lavc/lavf: use unique private classes.
lavc: use designated initializers for av_codec_context_class
Conflicts:
libavdevice/fbdev.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 b38afba57b..5ac57e5c32 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -469,15 +469,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"), @@ -490,13 +489,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 |