• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 175cc378
    Michael Niedermayer authored
    * qatar/master:
      movenc: Rudimentary IODs support.
      v410enc: fix output buffer size check
      v410enc: include correct headers
      fate: add -pix_fmt rgb48le to r210 test
      flvenc: Support muxing 16 kHz nellymoser
      configure: refactor list of programs into a variable
      fate: add r210 decoder test
      fate: split off Indeo FATE tests into their own file
      fate: split off ATRAC FATE tests into their own file
      fate: Add FATE tests for v410 encoder and decoder
      ARM: fix external symbol refs in rv40 asm
      westwood: Make sure audio header info is present when parsing audio packets
      libgsm: Reset the MS mode of GSM in the flush function
      libgsm: Set options on the right object
      ARM: dca: disable optimised decode_blockcodes() for old gcc
    
    Conflicts:
    	configure
    	libavformat/movenc.c
    	libavformat/movenc.h
    	tests/fate2.mak
    	tests/ref/acodec/alac
    	tests/ref/vsynth1/mpeg4
    	tests/ref/vsynth2/mpeg4
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    175cc378
Name
Last commit
Last update
doc Loading commit data...
ffpresets Loading commit data...
libavcodec Loading commit data...
libavdevice Loading commit data...
libavfilter Loading commit data...
libavformat 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...
avconv.c 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...