1. 08 Jan, 2012 1 commit
    • Michael Niedermayer's avatar
      Merge remote-tracking branch 'qatar/master' · 75747383
      Michael Niedermayer authored
      * qatar/master: (29 commits)
        cabac: Move code only used within the CABAC test program into the test program.
        vp56: Drop unnecessary cabac.h #include.
        h264-test: Initialize AVCodecContext.av_class.
        build: Skip compiling network.h and rtsp.h if networking is not enabled.
        cosmetics: drop some pointless parentheses
        Disable annoying warning without changing behavior
        faq: Solutions for common problems with sample paths when running FATE.
        avcodec: attempt to clarify the CODEC_CAP_DELAY documentation
        avcodec: fix avcodec_encode_audio() documentation.
        FATE: xmv-demux test; exercise the XMV demuxer without decoding the perceptual codecs inside.
        vqf: recognize more metadata chunks
        FATE test: BMV demuxer and associated video and audio decoders.
        FATE: indeo4 video decoder test.
        FATE: update xxan-wc4 test to a sample with more code coverage.
        Change the recent h264_mp4toannexb bitstream filter test to output to an elementary stream rather than a program stream.
        g722enc: validate AVCodecContext.trellis
        g722enc: set frame_size, and also handle an odd number of input samples
        g722enc: split encoding into separate functions for trellis vs. no trellis
        mpegaudiodec: Use clearer pointer math
        tta: Fix returned error code at EOF
        ...
      
      Conflicts:
      	libavcodec/h264.c
      	libavcodec/indeo3.c
      	libavcodec/interplayvideo.c
      	libavcodec/ivi_common.c
      	libavcodec/libxvidff.c
      	libavcodec/mpegvideo.c
      	libavcodec/ppc/mpegvideo_altivec.c
      	libavcodec/tta.c
      	libavcodec/utils.c
      	libavfilter/vsrc_buffer.c
      	libavformat/Makefile
      	tests/fate/indeo.mak
      	tests/ref/acodec/g722
      Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      75747383
  2. 07 Jan, 2012 39 commits