• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 349c6241
    Michael Niedermayer authored
    * qatar/master:
      indeo: Make ivi_calc_band_checksum() static, it is only used in one file.
      indeo: Drop unused debug function ivi_check_band().
      avcodec/utils: cast a function argument to shut up a compiler warning
      truemotion1: remove disabled code
      fix typo in comment
      fate: fix dependencies for non-SAMPLES avconv tests
      indeo: check for invalid motion vectors
      indeo: check that band output buffer exists
      indeo: clear allocated band buffers
      indeo: track tile macroblock size
      indeo: check custom Huffman tables for errors
      factor out common decoding code for Indeo 4 and Indeo 5
      mp3: fix start band index for block type 2 in 8kHz audio
      lavf: change some (de)muxer names to lowercase
      lavf: make output format matching case insensitive
    
    Conflicts:
    	libavcodec/indeo4.c
    	libavcodec/indeo5.c
    	libavcodec/ivi_common.c
    	libavcodec/utils.c
    	tests/fate/video.mak
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    349c6241
Name
Last commit
Last update
doc Loading commit data...
libavcodec Loading commit data...
libavdevice Loading commit data...
libavfilter Loading commit data...
libavformat Loading commit data...
libavresample Loading commit data...
libavutil Loading commit data...
libpostproc Loading commit data...
libswresample Loading commit data...
libswscale Loading commit data...
mt-work Loading commit data...
presets Loading commit data...
tests Loading commit data...
tools Loading commit data...
.gitignore Loading commit data...
COPYING.GPLv2 Loading commit data...
COPYING.GPLv3 Loading commit data...
COPYING.LGPLv2.1 Loading commit data...
COPYING.LGPLv3 Loading commit data...
CREDITS Loading commit data...
Changelog Loading commit data...
Doxyfile Loading commit data...
INSTALL Loading commit data...
LICENSE Loading commit data...
MAINTAINERS Loading commit data...
Makefile Loading commit data...
README Loading commit data...
RELEASE Loading commit data...
arch.mak Loading commit data...
cmdutils.c Loading commit data...
cmdutils.h Loading commit data...
cmdutils_common_opts.h Loading commit data...
common.mak Loading commit data...
configure Loading commit data...
ffmpeg.c Loading commit data...
ffplay.c Loading commit data...
ffprobe.c Loading commit data...
ffserver.c Loading commit data...
library.mak Loading commit data...
version.sh Loading commit data...