diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-05 12:11:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-05 12:11:48 +0100 |
| commit | 06ad309ab4b7089442968fa8ac49b8db5e2fce0a (patch) | |
| tree | d46cf264521ade26a73ff065e95ebf813ed195d9 | |
| parent | d7f9f34dc683f4990c670a9e7a5964997e6380b3 (diff) | |
| parent | 813b82b927b19532e3bc3397b972c8a27b9f6326 (diff) | |
| download | ffmpeg-streaming-06ad309ab4b7089442968fa8ac49b8db5e2fce0a.zip ffmpeg-streaming-06ad309ab4b7089442968fa8ac49b8db5e2fce0a.tar.gz | |
Merge commit '813b82b927b19532e3bc3397b972c8a27b9f6326'
* commit '813b82b927b19532e3bc3397b972c8a27b9f6326':
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: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | tests/fate/video.mak | 2 | ||||
| -rw-r--r-- | tests/ref/fate/mpeg2-field-enc | 1 |
3 files changed, 2 insertions, 3 deletions
@@ -1020,7 +1020,7 @@ check_type(){ } check_struct(){ - log check_type "$@" + log check_struct "$@" headers=$1 struct=$2 member=$3 diff --git a/tests/fate/video.mak b/tests/fate/video.mak index 78049e5..1b835c7 100644 --- a/tests/fate/video.mak +++ b/tests/fate/video.mak @@ -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_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-mxpeg: CMD = framecrc -idct simple -flags +bitexact -i $(SAMPLES)/mxpeg/m1.mxg -an diff --git a/tests/ref/fate/mpeg2-field-enc b/tests/ref/fate/mpeg2-field-enc index 903adb5..bf8a01a 100644 --- a/tests/ref/fate/mpeg2-field-enc +++ b/tests/ref/fate/mpeg2-field-enc @@ -29,4 +29,3 @@ 0, 36, 36, 1, 622080, 0xa45e1d95 0, 37, 37, 1, 622080, 0x6cc61d6c 0, 38, 38, 1, 622080, 0x6983b417 -0, 39, 39, 1, 622080, 0x982363c0 |
