• 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
..
amv Loading commit data...
asv1 Loading commit data...
asv2 Loading commit data...
cljr Loading commit data...
dnxhd_1080i Loading commit data...
dnxhd_720p Loading commit data...
dnxhd_720p_10bit Loading commit data...
dnxhd_720p_rd Loading commit data...
dv Loading commit data...
dv50 Loading commit data...
dv_411 Loading commit data...
error Loading commit data...
ffv1 Loading commit data...
flashsv Loading commit data...
flashsv2 Loading commit data...
flv Loading commit data...
h261 Loading commit data...
h263 Loading commit data...
h263p Loading commit data...
huffyuv Loading commit data...
jpeg2000 Loading commit data...
jpegls Loading commit data...
ljpeg Loading commit data...
mjpeg Loading commit data...
mpeg Loading commit data...
mpeg1b Loading commit data...
mpeg2 Loading commit data...
mpeg2_422 Loading commit data...
mpeg2_idct_int Loading commit data...
mpeg2_ilace Loading commit data...
mpeg2_ivlc_qprd Loading commit data...
mpeg2thread Loading commit data...
mpeg2thread_ilace Loading commit data...
mpeg4 Loading commit data...
mpeg4_adap Loading commit data...
mpeg4_qpel Loading commit data...
mpeg4_qprd Loading commit data...
mpeg4adv Loading commit data...
mpeg4nr Loading commit data...
mpeg4thread Loading commit data...
mpng Loading commit data...
msmpeg4 Loading commit data...
msmpeg4v2 Loading commit data...
msvideo1 Loading commit data...
prores Loading commit data...
qtrle Loading commit data...
qtrlegray Loading commit data...
rc Loading commit data...
rgb Loading commit data...
roq Loading commit data...
rv10 Loading commit data...
rv20 Loading commit data...
snow Loading commit data...
snowll Loading commit data...
svq1 Loading commit data...
v210 Loading commit data...
vref Loading commit data...
wmv1 Loading commit data...
wmv2 Loading commit data...
yuv Loading commit data...
zlib Loading commit data...
zmbv Loading commit data...