1. 10 May, 2012 1 commit
    • Michael Niedermayer's avatar
      Merge remote-tracking branch 'qatar/master' · 61930bd0
      Michael Niedermayer authored
      * qatar/master: (27 commits)
        libxvid: Give more suitable names to libxvid-related files.
        libxvid: Separate libxvid encoder from libxvid rate control code.
        jpeglsdec: Remove write-only variable in ff_jpegls_decode_lse().
        fate: cosmetics: lowercase some comments
        fate: Give more consistent names to some RealVideo/RealAudio tests.
        lavfi: add avfilter_get_audio_buffer_ref_from_arrays().
        lavfi: add extended_data to AVFilterBuffer.
        lavc: check that extended_data is properly set in avcodec_encode_audio2().
        lavc: pad last audio frame with silence when needed.
        samplefmt: add a function for filling a buffer with silence.
        samplefmt: add a function for copying audio samples.
        lavr: do not try to copy to uninitialized output audio data.
        lavr: make avresample_read() with NULL output discard samples.
        fate: split idroq audio and video into separate tests
        fate: improve dependencies
        fate: add convenient shorthands for ea-vp6, libavcodec, libavutil tests
        fate: split some combined tests into separate audio and video tests
        fate: fix dependencies for probe tests
        mips: intreadwrite: fix inline asm for gcc 4.8
        mips: intreadwrite: remove unnecessary inline asm
        ...
      
      Conflicts:
      	cmdutils.h
      	configure
      	doc/APIchanges
      	doc/filters.texi
      	ffmpeg.c
      	ffplay.c
      	libavcodec/internal.h
      	libavcodec/jpeglsdec.c
      	libavcodec/libschroedingerdec.c
      	libavcodec/libxvid.c
      	libavcodec/libxvid_rc.c
      	libavcodec/utils.c
      	libavcodec/version.h
      	libavfilter/avfilter.c
      	libavfilter/avfilter.h
      	libavfilter/buffersink.h
      	tests/Makefile
      	tests/fate/aac.mak
      	tests/fate/audio.mak
      	tests/fate/demux.mak
      	tests/fate/ea.mak
      	tests/fate/image.mak
      	tests/fate/libavutil.mak
      	tests/fate/lossless-audio.mak
      	tests/fate/lossless-video.mak
      	tests/fate/microsoft.mak
      	tests/fate/qt.mak
      	tests/fate/real.mak
      	tests/fate/screen.mak
      	tests/fate/video.mak
      	tests/fate/voice.mak
      	tests/fate/vqf.mak
      	tests/ref/fate/ea-mad
      	tests/ref/fate/ea-tqi
      Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      61930bd0
  2. 09 May, 2012 29 commits
  3. 08 May, 2012 10 commits