• 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
mov 137 Bytes