• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 99eb31e2
    Michael Niedermayer authored
    * qatar/master: (25 commits)
      Replace custom DEBUG preprocessor trickery by the standard one.
      vorbis: Remove non-compiling debug statement.
      vorbis: Remove pointless DEBUG #ifdef around debug output macros.
      cook: Remove non-compiling debug output.
      Remove pointless #ifdefs around function declarations in a header.
      Replace #ifdef + av_log() combinations by av_dlog().
      Replace custom debug output functions by av_dlog().
      cook: Remove unused debug functions.
      Remove stray extra arguments from av_dlog() invocations.
      targa: fix big-endian build
      v4l2: remove one forgotten use of AVFormatParameters.pix_fmt.
      vfwcap: add a framerate private option.
      v4l2: add a framerate private option.
      libdc1394: add a framerate private option.
      fbdev: add a framerate private option.
      bktr: add a framerate private option.
      oma: check avio_read() return value
      nutdec: remove unused variable
      Remove unused variables
      swscale: allocate larger buffer to handle altivec overreads.
      ...
    
    Conflicts:
    	ffmpeg.c
    	libavcodec/dca.c
    	libavcodec/dirac.c
    	libavcodec/error_resilience.c
    	libavcodec/h264.c
    	libavcodec/mpeg12.c
    	libavcodec/mpeg4videodec.c
    	libavcodec/mpegvideo.c
    	libavcodec/mpegvideo_enc.c
    	libavcodec/pthread.c
    	libavcodec/rv10.c
    	libavcodec/s302m.c
    	libavcodec/shorten.c
    	libavcodec/truemotion2.c
    	libavcodec/utils.c
    	libavdevice/dv1394.c
    	libavdevice/fbdev.c
    	libavdevice/libdc1394.c
    	libavdevice/v4l2.c
    	libavformat/4xm.c
    	libavformat/apetag.c
    	libavformat/asfdec.c
    	libavformat/avidec.c
    	libavformat/mmf.c
    	libavformat/mpeg.c
    	libavformat/mpegenc.c
    	libavformat/mpegts.c
    	libavformat/oggdec.c
    	libavformat/oggparseogm.c
    	libavformat/rl2.c
    	libavformat/rmdec.c
    	libavformat/rpl.c
    	libavformat/rtpdec_latm.c
    	libavformat/sauce.c
    	libavformat/sol.c
    	libswscale/utils.c
    	tests/ref/vsynth1/error
    	tests/ref/vsynth2/error
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    99eb31e2
vfwcap.c 14.5 KB