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 /libavdevice/alldevices.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 'libavdevice/alldevices.c')
| -rw-r--r-- | libavdevice/alldevices.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavdevice/alldevices.c b/libavdevice/alldevices.c index 8c36d270c2..ce2ea020cd 100644 --- a/libavdevice/alldevices.c +++ b/libavdevice/alldevices.c @@ -57,5 +57,6 @@ void avdevice_register_all(void) REGISTER_INDEV (X11_GRAB_DEVICE, x11_grab_device); /* external libraries */ + REGISTER_INDEV (LIBCDIO, libcdio); REGISTER_INDEV (LIBDC1394, libdc1394); } |