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>

diff --cc Changelog
index d41caab,24fa85c..c2e5e4e
--- 1/Changelog
--- 2/Changelog
+++ b/Changelog
@@@ -43,26 -41,40 +43,27 @@@ easier to use. The changes are
        '-preset <presetname>'.
      * -intra option was removed, it's equivalent to -g 0.
  - XMV demuxer
 +- LOAS demuxer
 +- ashowinfo filter added
  - Windows Media Image decoder
 +- amovie source added
  - LATM muxer
 -- showinfo filter
 -- split filter
 +- Speex encoder via libspeex
 +- JSON output in ffprobe
 +- WTV muxer
 +- Optional C++ Support (needed for libstagefright)
 +- H.264 Decoding on Android via Stagefright
 +- Prores decoder
 +- BIN/XBIN/ADF/IDF text file decoder
 +- aconvert audio filter added
 +- audio support to lavfi input device added
+ - libcdio-paranoia input device for audio CD grabbing
 -- select filter
  
  
 -version 0.7:
 -
 -- E-AC-3 audio encoder
 -- ac3enc: add channel coupling support
 -- floating-point sample format support for (E-)AC-3, DCA, AAC, Vorbis decoders
 -- H.264/MPEG frame-level multithreading
 -- av_metadata_* functions renamed to av_dict_* and moved to libavutil
 -- 4:4:4 H.264 decoding support
 -- 10-bit H.264 optimizations for x86
 -- bump libswscale for recently reported ABI break
 +version 0.8:
  
  
 -version 0.7_beta2:
 -
 -- VP8 frame-level multithreading
 -- NEON optimizations for VP8
 -- removed a lot of deprecated API cruft
 -- FFT and IMDCT optimizations for AVX (Sandy Bridge) processors
 -- DPX image encoder
 -- SMPTE 302M AES3 audio decoder
 -- ffmpeg no longer quits after the 'q' key is pressed; use 'ctrl+c' instead
 -- 9bit and 10bit per sample support in the H.264 decoder
 -
 -
 -version 0.7_beta1:
 -
 +- many many things we forgot because we rather write code than changelogs
  - WebM support in Matroska de/muxer
  - low overhead Ogg muxing
  - MMS-TCP support

diff --cc configure
index 5f5ea7a,e01d9fd..4cdb491
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -992,7 -928,7 +993,8 @@@ CONFIG_LIST=
      h264pred
      hardcoded_tables
      huffman
+     libcdio
 +    libcelt
      libdc1394
      libdirac
      libfaac
@@@ -1542,17 -1450,13 +1544,18 @@@ w64_demuxer_deps="wav_demuxer
  alsa_indev_deps="alsa_asoundlib_h snd_pcm_htimestamp"
  alsa_outdev_deps="alsa_asoundlib_h"
  bktr_indev_deps_any="dev_bktr_ioctl_bt848_h machine_ioctl_bt848_h dev_video_bktr_ioctl_bt848_h dev_ic_bt8xx_h"
 +dshow_indev_deps="IBaseFilter"
 +dshow_indev_extralibs="-lpsapi -lole32 -lstrmiids -luuid"
  dv1394_indev_deps="dv1394 dv_demuxer"
  fbdev_indev_deps="linux_fb_h"
 -jack_indev_deps="jack_jack_h"
 +jack_indev_deps="jack_jack_h sem_timedwait"
 +lavfi_indev_deps="avfilter"
+ libcdio_indev_deps="libcdio"
  libdc1394_indev_deps="libdc1394"
 +openal_indev_deps="openal"
  oss_indev_deps_any="soundcard_h sys_soundcard_h"
  oss_outdev_deps_any="soundcard_h sys_soundcard_h"
 +sdl_outdev_deps="sdl"
  sndio_indev_deps="sndio_h"
  sndio_outdev_deps="sndio_h"
  v4l_indev_deps="linux_videodev_h"
@@@ -3313,8 -3152,8 +3320,9 @@@ echo "libdxva2 enabled          ${dxva2
  echo "libva enabled             ${vaapi-no}"
  echo "libvdpau enabled          ${vdpau-no}"
  echo "AVISynth enabled          ${avisynth-no}"
 +echo "libcelt enabled           ${libcelt-no}"
  echo "frei0r enabled            ${frei0r-no}"
+ echo "libcdio support           ${libcdio-no}"
  echo "libdc1394 support         ${libdc1394-no}"
  echo "libdirac enabled          ${libdirac-no}"
  echo "libfaac enabled           ${libfaac-no}"

diff --cc doc/filters.texi
Simple merge

diff --cc libavdevice/Makefile
Simple merge

diff --cc libavdevice/alldevices.c
Simple merge

diff --cc libavdevice/avdevice.h
index 8b75d5c,c0d392d..68e3a46
--- 1/libavdevice/avdevice.h
--- 2/libavdevice/avdevice.h
+++ b/libavdevice/avdevice.h
@@@ -20,11 -20,10 +20,11 @@@
  #define AVDEVICE_AVDEVICE_H
  
  #include "libavutil/avutil.h"
 +#include "libavformat/avformat.h"
  
  #define LIBAVDEVICE_VERSION_MAJOR 53
- #define LIBAVDEVICE_VERSION_MINOR  3
- #define LIBAVDEVICE_VERSION_MICRO  3
 -#define LIBAVDEVICE_VERSION_MINOR  1
++#define LIBAVDEVICE_VERSION_MINOR  4
+ #define LIBAVDEVICE_VERSION_MICRO  0
  
  #define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \
                                                 LIBAVDEVICE_VERSION_MINOR, \

diff --cc libavfilter/vf_select.c
Simple merge

diff --cc libavformat/ingenientdec.c
Simple merge

diff --cc libavformat/movenc.c
Simple merge

diff --cc libavformat/pcmdec.c
Simple merge

diff --cc libavformat/rawdec.c
Simple merge

diff --cc libavformat/rawdec.h
Simple merge

diff --cc libavformat/rawvideodec.c
Simple merge

diff --cc tests/ref/lavf/mov
index 940e518,07404aa..2071c5a
--- 1/tests/ref/lavf/mov
--- 2/tests/ref/lavf/mov
+++ b/tests/ref/lavf/mov
@@@ -1,3 -1,3 +1,3 @@@
- a901cd05609080e8f5c09ca5da7290f0 *./tests/data/lavf/lavf.mov
 -4a3ad13f0355cb5d119109778d555207 *./tests/data/lavf/lavf.mov
++2e2529d01dbe42e4dd63580a351898f5 *./tests/data/lavf/lavf.mov
  357681 ./tests/data/lavf/lavf.mov
  ./tests/data/lavf/lavf.mov CRC=0x2f6a9b26