1. 10 Feb, 2012 1 commit
    • Michael Niedermayer's avatar
      Merge remote-tracking branch 'qatar/master' · 8c6ebab7
      Michael Niedermayer authored
      * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
      8c6ebab7
  2. 09 Feb, 2012 38 commits
  3. 08 Feb, 2012 1 commit