Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 5 Jan 2012 01:03:12 +0000 (02:03 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 5 Jan 2012 01:03:12 +0000 (02:03 +0100)
commit7f83db312454b3673a4dfd34745428f61309ab30
tree27c92b052b83e4b3bf95a33fbe6979aaa00f8184
parentc4eec85a1fa768025f88261995af08f1dba9685d
parentfeb15cee5e19a1e31d075ec08d598d64c2dc38ef
Merge remote-tracking branch 'qatar/master'

* qatar/master: (46 commits)
  mtv: Make sure audio_subsegments is not 0
  v4l2: use V4L2_FMT_FLAG_EMULATED only if it is defined
  avconv: add symbolic names for -vsync parameters
  flvdec: Fix compiler warning for uninitialized variables
  rtsp: Fix compiler warning for uninitialized variable
  ulti: convert to new bytestream API.
  swscale: Use standard multiple inclusion guards in ppc/ header files.
  Place some START_TIMER invocations in separate blocks.
  v4l2: list available formats
  v4l2: set the proper codec_tag
  v4l2: refactor device_open
  v4l2: simplify away io_method
  v4l2: cosmetics
  v4l2: uniform and format options
  v4l2: do not force interlaced mode
  avio: exit early in fill_buffer without read_packet
  vc1dec: fix invalid memory access for small video dimensions
  rv34: fix invalid memory access for small video dimensions
  rv34: joint coefficient decoding and dequantization
  avplay: Don't call avio_set_interrupt_cb(NULL)
  ...

Conflicts:
Changelog
avconv.c
doc/APIchanges
doc/indevs.texi
libavcodec/adxenc.c
libavcodec/dnxhdenc.c
libavcodec/h264.c
libavdevice/v4l2.c
libavformat/flvdec.c
libavformat/mtv.c
libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
33 files changed:
Changelog
avconv.c
configure
doc/APIchanges
doc/avconv.texi
doc/general.texi
doc/indevs.texi
ffmpeg.c
libavcodec/adxdec.c
libavcodec/adxenc.c
libavcodec/bytestream.h
libavcodec/cabac.c
libavcodec/cabac.h
libavcodec/dnxhdenc.c
libavcodec/h264.c
libavcodec/indeo5.c
libavcodec/libspeexenc.c
libavcodec/rv34.c
libavcodec/rv34data.h
libavcodec/ulti.c
libavcodec/vc1dec.c
libavdevice/v4l2.c
libavformat/Makefile
libavformat/allformats.c
libavformat/aviobuf.c
libavformat/mtv.c
libavformat/rawenc.c
libpostproc/postprocess_template.c
libswscale/Makefile
libswscale/ppc/yuv2rgb_altivec.h
libswscale/swscale.c
libswscale/x86/scale.asm
tests/codec-regression.sh