]> git.sesse.net Git - ffmpeg/commit
projects / ffmpeg / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f514695 723c35f)
Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Dec 2011 00:19:04 +0000 (01:19 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Dec 2011 00:19:18 +0000 (01:19 +0100)
commit49b909b980eb18f1049d9b31ee99f177c58165ae
treecab8d8d6d658aaeeffb2a765b4bda6aa310406bbtree | snapshot
parentf51469538f239bcfc1bb2ee697d25d91a8b4b39dcommit | diff
parent723c35feb0d913e07e7f5a3b6be94cb0b79fd086commit | diff
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: split off vqf/twinvq FATE tests into their own file
  fate: split off mpc FATE tests into their own file
  fate: split off libavcodec FATE tests into their own file
  fate: split off Microsoft codec FATE tests into their own file
  fate: group all VP* codec FATE tests together in one file
  swscale: prevent invalid writes in packed_16bpc_bswap

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libswscale/swscale_unscaled.c diff1 | diff2 | blob | history
tests/Makefile diff1 | diff2 | blob | history
tests/fate.mak diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.