mirror of https://git.ffmpeg.org/ffmpeg.git
1a6a088f7c
* qatar/master: fate: whitespace cosmetics fate: split off video codec FATE tests into their own file fate: split off audio codec FATE tests into their own file fate: split off Electronic Arts codec FATE tests into their own file fate: split off QuickTime codec FATE tests into their own file fate: split off voice codec FATE tests into their own file fate: split off demuxer FATE tests into their own file cosmetics: Drop unnecessary parentheses around return values. fate: drop pointless _audio and _video suffixes from xan tests qt-faststart: K&R reformatting; fix comment typos FATE: Add test for H.264 MP4->annex.B bitstream filter. Conflicts: ffplay.c tests/fate.mak tests/fate/h264.mak tests/fate/image.mak tests/fate/lossless-audio.mak tests/fate/lossless-video.mak tests/fate/qtrle.mak tests/fate/real.mak tests/fate/screen.mak 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 |