Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 9 Feb 2012 23:38:13 +0000 (00:38 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 10 Feb 2012 00:20:07 +0000 (01:20 +0100)
commit8c6ebab747ca8311b81ff4d0a7c17ef60b372f32
tree677444f33cd2ee65df88809ca820ed57d2077ca3
parentea4037162fb0afa871e5312a7b23c828d2b85066
parentc57fe49da8feda7d2e6c266978250a15a83e0484
Merge remote-tracking branch 'qatar/master'

* qatar/master: (26 commits)
  eac3dec: replace undefined 1<<31 with INT32_MIN in noise generation
  yadif: specify array size outside DECLARE_ALIGNED
  prores: specify array size outside DECLARE_ALIGNED brackets.
  WavPack demuxer: set packet duration
  tta: use skip_bits_long()
  mxfdec: Ignore the last entry in Avid's index table segments
  mxfdec: Sanity-check SampleRate
  mxfdec: Handle small EditUnitByteCount
  mxfdec: Consider OPAtom files that do not have exactly one EC to be OP1a
  mxfdec: Don't crash in mxf_packet_timestamps() if current_edit_unit overflows
  mxfdec: Zero nb_ptses in mxf_compute_ptses_fake_index()
  mxfdec: Sanity check PreviousPartition
  mxfdec: Never seek back in local sets and KLVs
  mxfdec: Move the current_partition check inside mxf_read_header()
  mxfdec: Fix infinite loop in mxf_packet_timestamps()
  mxfdec: Check eof_reached in mxf_read_local_tags()
  mxfdec: Check for NULL component
  mxfdec: Make sure mxf->nb_index_tables > 0 in mxf_packet_timestamps()
  mxfdec: Make sure x < index_table->nb_ptses
  build: Add missing directories to DIRS declarations.
  ...

Conflicts:
doc/build_system.txt
doc/fate.texi
libavfilter/x86/yadif_template.c
libavformat/mxfdec.c
libavutil/Makefile
tests/fate/audio.mak
tests/fate/prores.mak
tests/fate/screen.mak
tests/fate/video.mak
tests/ref/fate/bethsoft-vid
tests/ref/fate/cscd
tests/ref/fate/dfa4
tests/ref/fate/nuv
tests/ref/fate/vp8-sign-bias
tests/ref/fate/wmv8-drm
tests/ref/lavf/gxf

Merged-by: Michael Niedermayer <michaelni@gmx.at>
35 files changed:
doc/fate.texi
doc/ffserver.conf
doc/filters.texi
libavcodec/Makefile
libavcodec/arm/vp8.h
libavcodec/bfin/dsputil_bfin.c
libavcodec/bfin/fdct_bfin.S
libavcodec/bfin/idct_bfin.S
libavcodec/bfin/mpegvideo_bfin.c
libavcodec/bfin/pixels_bfin.S
libavcodec/bfin/vp3_bfin.c
libavcodec/bfin/vp3_idct_bfin.S
libavcodec/bytestream.h
libavcodec/eac3dec.c
libavcodec/ppc/idct_altivec.c
libavcodec/proresdec_lgpl.c
libavcodec/ps2/dsputil_mmi.c
libavcodec/ps2/idct_mmi.c
libavcodec/ps2/mpegvideo_mmi.c
libavcodec/rawenc.c
libavcodec/tta.c
libavcodec/x86/fdct_mmx.c
libavcodec/x86/fft.c
libavcodec/x86/fft_3dn2.c
libavcodec/x86/fft_sse.c
libavcodec/x86/idct_mmx_xvid.c
libavfilter/x86/yadif_template.c
libavformat/apetag.h
libavformat/mxfdec.c
libavformat/wv.c
libavutil/Makefile
libswscale/ppc/yuv2rgb_altivec.h
tests/fate/audio.mak
tests/fate/prores.mak
tests/fate/screen.mak