diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-17 22:25:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-17 22:36:43 +0200 |
| commit | 9a9ceb8776264c799ff9669ed7e287a5daaab564 (patch) | |
| tree | 25748ff74acaa620aa627ed7797a87e986959f19 /libavformat/ingenientdec.c | |
| parent | 979bea13003ef489d95d2538ac2fb1c26c6f103b (diff) | |
| parent | d763fb7d47fdbd107ea65cdf511f2f21558f6610 (diff) | |
| download | ffmpeg-9a9ceb8776264c799ff9669ed7e287a5daaab564.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavfi: add select filter
oggdec: fix out of bound write in the ogg demuxer
movenc: create an alternate group for each media type
lavd: add libcdio-paranoia input device for audio CD grabbing
rawdec: refactor private option for raw video demuxers
pcmdec: use unique classes for all pcm demuxers.
rawdec: g722 is always 1 channel/16kHz
Conflicts:
Changelog
configure
doc/filters.texi
libavdevice/avdevice.h
libavfilter/avfilter.h
libavfilter/vf_select.c
tests/ref/lavf/mov
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/ingenientdec.c')
| -rw-r--r-- | libavformat/ingenientdec.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/ingenientdec.c b/libavformat/ingenientdec.c index 791e935433..97774abbcd 100644 --- a/libavformat/ingenientdec.c +++ b/libavformat/ingenientdec.c @@ -58,6 +58,8 @@ static int ingenient_read_packet(AVFormatContext *s, AVPacket *pkt) return ret; } +FF_RAWVIDEO_DEMUXER_CLASS(ingenient) + AVInputFormat ff_ingenient_demuxer = { .name = "ingenient", .long_name = NULL_IF_CONFIG_SMALL("raw Ingenient MJPEG"), @@ -67,5 +69,5 @@ AVInputFormat ff_ingenient_demuxer = { .flags= AVFMT_GENERIC_INDEX, .extensions = "cgi", // FIXME .value = CODEC_ID_MJPEG, - .priv_class = &ff_rawvideo_demuxer_class, + .priv_class = &ingenient_demuxer_class, }; |