Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 18 May 2011 03:42:42 +0000 (05:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 18 May 2011 03:42:42 +0000 (05:42 +0200)
commitb4bcd1e2f1d603419ea9d4fdaab400b1ad35e58c
tree9a1cf8971e8f1247e0c99a160050be8d547328cb
parent7a88617c43ce534d94591dd78d4958333492b939
parenta26d2b4bc8af02b27168c277c5097273c05652c2
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Fix compilation of iirfilter-test.
  libx264: handle closed GOP codec flag
  lavf: remove duplicate assignment in avformat_alloc_context.
  lavf: use designated initializers for AVClasses.
  flvdec: clenup debug code
  asfdec: fix possible overread on broken files.
  asfdec: do not fall back to binary/generic search
  asfdec: reindent after previous commit c7bd5ed
  asfdec: fallback to binary search internally
  mpegaudio: add _fixed suffix to some names
  Modify x86util.asm to ease transitioning to 10-bit H.264 assembly.
  dct: build dct32 as separate object files
  qdm2: include correct header for rdft

Conflicts:
ffpresets/libx264-fast.ffpreset
ffpresets/libx264-fast_firstpass.ffpreset
ffpresets/libx264-faster.ffpreset
ffpresets/libx264-faster_firstpass.ffpreset
ffpresets/libx264-medium.ffpreset
ffpresets/libx264-medium_firstpass.ffpreset
ffpresets/libx264-placebo.ffpreset
ffpresets/libx264-placebo_firstpass.ffpreset
ffpresets/libx264-slow.ffpreset
ffpresets/libx264-slow_firstpass.ffpreset
ffpresets/libx264-slower.ffpreset
ffpresets/libx264-slower_firstpass.ffpreset
ffpresets/libx264-superfast.ffpreset
ffpresets/libx264-superfast_firstpass.ffpreset
ffpresets/libx264-ultrafast.ffpreset
ffpresets/libx264-ultrafast_firstpass.ffpreset
ffpresets/libx264-veryfast.ffpreset
ffpresets/libx264-veryfast_firstpass.ffpreset
ffpresets/libx264-veryslow.ffpreset
ffpresets/libx264-veryslow_firstpass.ffpreset
libavformat/flvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
20 files changed:
configure
libavcodec/Makefile
libavcodec/dct.c
libavcodec/dct32.c
libavcodec/iirfilter.c
libavcodec/libx264.c
libavcodec/mpc.c
libavcodec/mpegaudio.h
libavcodec/mpegaudio_tablegen.c
libavcodec/mpegaudio_tablegen.h
libavcodec/mpegaudiodec.c
libavcodec/qdm2.c
libavcodec/x86/dsputilenc_yasm.asm
libavcodec/x86/h264_idct.asm
libavcodec/x86/vp8dsp.asm
libavcodec/x86/x86util.asm
libavformat/asfdec.c
libavformat/avformat.h
libavformat/flvdec.c
libavformat/utils.c