aboutsummaryrefslogtreecommitdiffstats
path: root/tests/ref/fate/vsynth1-mpng
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-10-17 14:43:26 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-10-17 14:43:26 +0200
commitc079da5073167b5e7e959af12ef157e71bde0015 (patch)
tree65e084a372ae7e9e441a1e7713941a803dc19f1f /tests/ref/fate/vsynth1-mpng
parentfadfbb354b30f018338c66712bfe5a6b58970b9a (diff)
parent0bca0283ccded5e32da143a462168ad1988a58fd (diff)
downloadffmpeg-c079da5073167b5e7e959af12ef157e71bde0015.tar.gz
Merge commit '0bca0283ccded5e32da143a462168ad1988a58fd'
* commit '0bca0283ccded5e32da143a462168ad1988a58fd': riff: do not write empty INFO tags Conflicts: tests/ref/fate/vsynth1-cljr tests/ref/fate/vsynth1-ffvhuff tests/ref/fate/vsynth1-h261 tests/ref/fate/vsynth1-h263 tests/ref/fate/vsynth1-h263-obmc tests/ref/fate/vsynth1-h263p tests/ref/fate/vsynth1-huffyuv tests/ref/fate/vsynth1-jpegls tests/ref/fate/vsynth1-mjpeg tests/ref/fate/vsynth1-mpeg4-adap tests/ref/fate/vsynth1-mpeg4-adv tests/ref/fate/vsynth1-mpeg4-error tests/ref/fate/vsynth1-mpeg4-nr tests/ref/fate/vsynth1-mpeg4-qpel tests/ref/fate/vsynth1-mpeg4-qprd tests/ref/fate/vsynth1-mpeg4-rc tests/ref/fate/vsynth1-mpeg4-thread tests/ref/fate/vsynth1-msmpeg4 tests/ref/fate/vsynth1-msmpeg4v2 tests/ref/fate/vsynth1-rgb tests/ref/fate/vsynth1-wmv1 tests/ref/fate/vsynth1-wmv2 tests/ref/fate/vsynth1-yuv tests/ref/fate/vsynth2-cljr tests/ref/fate/vsynth2-ffvhuff tests/ref/fate/vsynth2-h261 tests/ref/fate/vsynth2-h263 tests/ref/fate/vsynth2-h263-obmc tests/ref/fate/vsynth2-h263p tests/ref/fate/vsynth2-huffyuv tests/ref/fate/vsynth2-jpegls tests/ref/fate/vsynth2-mjpeg tests/ref/fate/vsynth2-mpeg4-adap tests/ref/fate/vsynth2-mpeg4-error tests/ref/fate/vsynth2-mpeg4-nr tests/ref/fate/vsynth2-mpeg4-qpel tests/ref/fate/vsynth2-mpeg4-qprd tests/ref/fate/vsynth2-mpeg4-rc tests/ref/fate/vsynth2-mpeg4-thread tests/ref/fate/vsynth2-msmpeg4 tests/ref/fate/vsynth2-msmpeg4v2 tests/ref/fate/vsynth2-rgb tests/ref/fate/vsynth2-wmv1 tests/ref/fate/vsynth2-wmv2 tests/ref/fate/vsynth2-yuv tests/ref/lavf/avi tests/ref/seek/h261_avi tests/ref/seek/h263_avi tests/ref/seek/h263p_avi tests/ref/seek/lavf_avi tests/ref/seek/mjpeg_avi tests/ref/seek/mpeg4_adap_avi tests/ref/seek/mpeg4_error_avi tests/ref/seek/mpeg4_nr_avi tests/ref/seek/mpeg4_qpel_avi tests/ref/seek/mpeg4_qprd_avi tests/ref/seek/mpeg4_rc_avi tests/ref/seek/mpeg4_thread_avi tests/ref/seek/msmpeg4_avi tests/ref/seek/msmpeg4v2_avi tests/ref/seek/wmv1_avi tests/ref/seek/wmv2_avi Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/fate/vsynth1-mpng')
-rw-r--r--tests/ref/fate/vsynth1-mpng4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/ref/fate/vsynth1-mpng b/tests/ref/fate/vsynth1-mpng
index ade0cf42b1..5ca268bf76 100644
--- a/tests/ref/fate/vsynth1-mpng
+++ b/tests/ref/fate/vsynth1-mpng
@@ -1,4 +1,4 @@
-be741137074c7d3b160e2eec464b8c61 *tests/data/fate/vsynth1-mpng.avi
-12158288 tests/data/fate/vsynth1-mpng.avi
+10bcdf8600d3985aeb57dc774df2b747 *tests/data/fate/vsynth1-mpng.avi
+12158276 tests/data/fate/vsynth1-mpng.avi
93695a27c24a61105076ca7b1f010bbd *tests/data/fate/vsynth1-mpng.out.rawvideo
stddev: 3.42 PSNR: 37.44 MAXDIFF: 48 bytes: 7603200/ 7603200