mirror of https://git.ffmpeg.org/ffmpeg.git
00c0465dbc
* 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> |
||
---|---|---|
.. | ||
build_libstagefright | ||
clean-diff | ||
cws2fws.c | ||
enum_options.c | ||
graph2dot.c | ||
lavfi-showfiltfmts.c | ||
patcheck | ||
pktdumper.c | ||
probetest.c | ||
qt-faststart.c | ||
trasher.c | ||
unwrap-diff |