Commit 06ad309a authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '813b82b9'

* commit '813b82b9':
  configure: Fix silly typo in logging command of check_struct()
  fate: remove last incomplete frame from mpeg2-field-enc test

Conflicts:
	tests/fate/video.mak
	tests/ref/fate/mpeg2-field-enc
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents d7f9f34d 813b82b9
...@@ -1020,7 +1020,7 @@ check_type(){ ...@@ -1020,7 +1020,7 @@ check_type(){
} }
check_struct(){ check_struct(){
log check_type "$@" log check_struct "$@"
headers=$1 headers=$1
struct=$2 struct=$2
member=$3 member=$3
......
...@@ -181,7 +181,7 @@ FATE_VIDEO-$(call DEMDEC, MVI, MOTIONPIXELS) += fate-motionpixels ...@@ -181,7 +181,7 @@ FATE_VIDEO-$(call DEMDEC, MVI, MOTIONPIXELS) += fate-motionpixels
fate-motionpixels: CMD = framecrc -i $(SAMPLES)/motion-pixels/INTRO-partial.MVI -an -pix_fmt rgb24 -vframes 111 fate-motionpixels: CMD = framecrc -i $(SAMPLES)/motion-pixels/INTRO-partial.MVI -an -pix_fmt rgb24 -vframes 111
FATE_VIDEO-$(call DEMDEC, MPEGTS, MPEG2VIDEO) += fate-mpeg2-field-enc FATE_VIDEO-$(call DEMDEC, MPEGTS, MPEG2VIDEO) += fate-mpeg2-field-enc
fate-mpeg2-field-enc: CMD = framecrc -flags +bitexact -dct fastint -idct simple -i $(SAMPLES)/mpeg2/mpeg2_field_encoding.ts -an fate-mpeg2-field-enc: CMD = framecrc -flags +bitexact -dct fastint -idct simple -i $(SAMPLES)/mpeg2/mpeg2_field_encoding.ts -an -vframes 30
FATE_VIDEO-$(call DEMDEC, MXG, MXPEG) += fate-mxpeg FATE_VIDEO-$(call DEMDEC, MXG, MXPEG) += fate-mxpeg
fate-mxpeg: CMD = framecrc -idct simple -flags +bitexact -i $(SAMPLES)/mxpeg/m1.mxg -an fate-mxpeg: CMD = framecrc -idct simple -flags +bitexact -i $(SAMPLES)/mxpeg/m1.mxg -an
......
...@@ -29,4 +29,3 @@ ...@@ -29,4 +29,3 @@
0, 36, 36, 1, 622080, 0xa45e1d95 0, 36, 36, 1, 622080, 0xa45e1d95
0, 37, 37, 1, 622080, 0x6cc61d6c 0, 37, 37, 1, 622080, 0x6cc61d6c
0, 38, 38, 1, 622080, 0x6983b417 0, 38, 38, 1, 622080, 0x6983b417
0, 39, 39, 1, 622080, 0x982363c0
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment