1. 22 Dec, 2011 1 commit
    • Michael Niedermayer's avatar
      Merge remote-tracking branch 'qatar/master' · 52c522c7
      Michael Niedermayer authored
      * qatar/master: (27 commits)
        asfdec: add side data to ASFStream packet instead of output packet.
        idroqdec: set AVFMTCTX_NOHEADER and create streams as they occur.
        nellymoserdec: Indicate that the decoder can handle changed parameters
        libavcodec: Apply parameter change side data when decoding audio
        flvdec: Add param change side data if the sample rate or channels have changed
        libavformat: Add a utility function for adding parameter change side data
        libavcodec: Define a side data type for parameter changes
        aacdec: Handle new extradata passed as side data
        flvdec: Export new AAC/H.264 extradata as side data on the next packet
        libavcodec: Define a side data type for new extradata
        flacdec: skip all track indices at once instead of looping.
        mxf: Add PictureEssenceCoding UL for V210.
        mxfdec: consider QuantizationBits between 17 and 24 to be pcm_s24*
        mxfenc: Add support for MPEG-2 MP@HL-14 in mxf container.
        mxf: H.264/MPEG-4 AVC Intra support
        configure: Show whether the safe bitstream reader is enabled
        x86: Tighten register constraints for decode_significance*_x86.
        Replace Subversion revisions in comments by Git hashes.
        h264_cabac: synchronize decode_significance_*_x86 conditionals
        w32threads: wait for the waked thread in pthread_cond_signal.
        ...
      
      Conflicts:
      	libavcodec/avcodec.h
      	libavcodec/version.h
      	libavformat/flvdec.c
      	libavformat/utils.c
      	tests/ref/lavfi/pixdesc
      	tests/ref/lavfi/pixfmts_copy
      	tests/ref/lavfi/pixfmts_null
      	tests/ref/lavfi/pixfmts_scale
      	tests/ref/lavfi/pixfmts_vflip
      Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      52c522c7
  2. 21 Dec, 2011 38 commits
  3. 20 Dec, 2011 1 commit