1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Michael Niedermayer 10ac6f3ce9 Merge commit '952f943d40e9dbcd68bc851460cc99268091a294'
* commit '952f943d40e9dbcd68bc851460cc99268091a294':
  FATE: add a jv test

Conflicts:
	tests/fate/video.mak
	tests/ref/fate/jv

See: 7c52070131b7eb7f867fe1eab7383498814826df
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-17 01:22:35 +01:00
..
2013-09-21 03:37:09 +00:00
2013-10-31 20:20:16 +01:00
2013-10-15 12:41:23 +00:00
2013-07-29 19:20:27 +02:00
2013-08-08 22:59:42 +02:00