Changeset 9a9ceb8 in ffmpeg

Timestamp:

Sep 17, 2011, 8:36:43 PM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

eac673d5

Parents:

979bea13 (diff), d763fb7d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (09/17/11 20:25:13)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (09/17/11 20:36:43)

Message:

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>

(No files)