-
- Downloads
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: split off DPCM codec FATE tests into their own file
fate: split off PCM codec FATE tests into their own file
libvorbis: K&R reformatting cosmetics
libmp3lame: K&R formatting cosmetics
fate: Add a video test for xxan decoder
mpegvideo_enc: K&R cosmetics (line 1000-2000).
avconv: K&R cosmetics
qt-faststart: Fix up indentation
indeo4: remove two unused variables
doxygen: cleanup style to support older doxy
fate: add more tests for VC-1 decoder
applehttpproto: Apply the same reload interval changes as for the demuxer
applehttp: Use half the target duration as interval if the playlist didn't update
applehttp: Use the last segment duration as reload interval
lagarith: add decode support for arith rgb24 mode
Conflicts:
avconv.c
libavcodec/libmp3lame.c
libavcodec/mpegvideo_enc.c
Merged-by:
Michael Niedermayer <michaelni@gmx.at>
Showing
- avconv.c 303 additions, 294 deletionsavconv.c
- doc/doxy/doxy_stylesheet.css 21 additions, 54 deletionsdoc/doxy/doxy_stylesheet.css
- ffmpeg.c 288 additions, 281 deletionsffmpeg.c
- libavcodec/indeo4.c 7 additions, 4 deletionslibavcodec/indeo4.c
- libavcodec/libmp3lame.c 72 additions, 67 deletionslibavcodec/libmp3lame.c
- libavcodec/libvorbis.c 79 additions, 73 deletionslibavcodec/libvorbis.c
- libavcodec/mpegvideo_enc.c 529 additions, 392 deletionslibavcodec/mpegvideo_enc.c
- libavformat/applehttp.c 15 additions, 6 deletionslibavformat/applehttp.c
- libavformat/applehttpproto.c 12 additions, 2 deletionslibavformat/applehttpproto.c
- tests/Makefile 2 additions, 0 deletionstests/Makefile
- tests/fate.mak 0 additions, 50 deletionstests/fate.mak
- tests/fate/dpcm.mak 42 additions, 0 deletionstests/fate/dpcm.mak
- tests/fate/microsoft.mak 9 additions, 0 deletionstests/fate/microsoft.mak
- tests/fate/pcm.mak 32 additions, 0 deletionstests/fate/pcm.mak
- tests/fate2.mak 3 additions, 0 deletionstests/fate2.mak
- tests/ref/fate/dpcm_xan_audio 0 additions, 0 deletionstests/ref/fate/dpcm_xan_audio
- tests/ref/fate/vc1_sa00050 30 additions, 0 deletionstests/ref/fate/vc1_sa00050
- tests/ref/fate/vc1_sa10091 30 additions, 0 deletionstests/ref/fate/vc1_sa10091
- tests/ref/fate/vc1_sa20021 60 additions, 0 deletionstests/ref/fate/vc1_sa20021
- tests/ref/fate/xxan_wc4_video 10 additions, 0 deletionstests/ref/fate/xxan_wc4_video
Loading
Please register or sign in to comment