Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Jul 2012 23:56:31 +0000 (01:56 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Jul 2012 00:16:26 +0000 (02:16 +0200)
commit706bd8ea19a6f723795547885714033ac68a4d74
tree39f7933c9432b35801c81903fa7dc352de92fe95
parent0f8f9248471bbee5649c8efdc52d02c1cf93bba1
parentc83f44dba11930744e167856b48fbc24a8ff0e63
Merge remote-tracking branch 'qatar/master'

* qatar/master: (35 commits)
  h264_idct_10bit: port x86 assembly to cpuflags.
  x86inc: clip num_args to 7 on x86-32.
  x86inc: sync to latest version from x264.
  fft: rename "z" to "zc" to prevent name collision.
  wv: return meaningful error codes.
  wv: return AVERROR_EOF on EOF, not EIO.
  mp3dec: forward errors for av_get_packet().
  mp3dec: remove a pointless local variable.
  mp3dec: remove commented out cruft.
  lavfi: bump minor to mark stabilizing the ABI.
  FATE: add tests for yadif.
  FATE: add a test for delogo video filter.
  FATE: add a test for amix audio filter.
  audiogen: allow specifying random seed as a commandline parameter.
  vc1dec: Override invalid macroblock quantizer
  vc1: avoid reading beyond the last line in vc1_draw_sprites()
  vc1dec: check that coded slice positions and interlacing match.
  vc1dec: Do not ignore ff_vc1_parse_frame_header_adv return value
  configure: Move parts that should not be user-selectable to CONFIG_EXTRA
  lavf: remove commented out cruft in avformat_find_stream_info()
  ...

Conflicts:
Makefile
configure
libavcodec/vc1dec.c
libavcodec/x86/h264_deblock.asm
libavcodec/x86/h264_deblock_10bit.asm
libavcodec/x86/h264dsp_mmx.c
libavfilter/version.h
libavformat/mp3dec.c
libavformat/utils.c
libavformat/wv.c
libavutil/x86/x86inc.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
39 files changed:
common.mak
configure
libavcodec/vc1dec.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/fft_mmx.asm
libavcodec/x86/h264_deblock.asm
libavcodec/x86/h264_deblock_10bit.asm
libavcodec/x86/h264_idct_10bit.asm
libavcodec/x86/h264dsp_mmx.c
libavcodec/x86/rv34dsp.asm
libavcodec/x86/vp3dsp.asm
libavcodec/x86/vp3dsp_init.c
libavcodec/x86/vp56dsp.asm
libavcodec/x86/vp56dsp_init.c
libavdevice/Makefile
libavdevice/alldevices.c
libavdevice/avdevice.h
libavdevice/fbdev.c
libavdevice/jack_audio.c
libavdevice/oss_audio.c
libavdevice/x11grab.c
libavfilter/version.h
libavformat/hls.c
libavformat/mp3dec.c
libavformat/rtpdec.c
libavformat/rtsp.c
libavformat/rtspdec.c
libavformat/rtspenc.c
libavformat/sapenc.c
libavformat/tls.c
libavformat/utils.c
libavformat/wv.c
libavutil/x86/x86inc.asm
library.mak
tests/audiogen.c
tests/fate/filter.mak
tests/ref/fate/filter-delogo
tests/ref/fate/filter-yadif-mode0
tests/ref/fate/filter-yadif-mode1