• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 9a9ceb87
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    9a9ceb87
Name
Last commit
Last update
doc Loading commit data...
ffpresets Loading commit data...
libavcodec Loading commit data...
libavdevice Loading commit data...
libavfilter Loading commit data...
libavformat Loading commit data...
libavutil Loading commit data...
libpostproc Loading commit data...
libswscale Loading commit data...
mt-work Loading commit data...
tests Loading commit data...
tools Loading commit data...
.gitignore Loading commit data...
COPYING.GPLv2 Loading commit data...
COPYING.GPLv3 Loading commit data...
COPYING.LGPLv2.1 Loading commit data...
COPYING.LGPLv3 Loading commit data...
CREDITS Loading commit data...
Changelog Loading commit data...
Doxyfile Loading commit data...
INSTALL Loading commit data...
LICENSE Loading commit data...
MAINTAINERS Loading commit data...
Makefile Loading commit data...
README Loading commit data...
RELEASE Loading commit data...
avconv.c Loading commit data...
cmdutils.c Loading commit data...
cmdutils.h Loading commit data...
cmdutils_common_opts.h Loading commit data...
common.mak Loading commit data...
configure Loading commit data...
ffmpeg.c Loading commit data...
ffplay.c Loading commit data...
ffprobe.c Loading commit data...
ffserver.c Loading commit data...
subdir.mak Loading commit data...
version.sh Loading commit data...