mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Merge commit '66d04c068a30751750818dcfbb6555ab74eb3f6d'
* commit '66d04c068a30751750818dcfbb6555ab74eb3f6d': fate: Explicitly use gray16le in fate-sgi-gray16 Conflicts: tests/fate/image.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
909757fabd
@ -66,7 +66,7 @@ FATE_SGI += fate-sgi-gray
|
||||
fate-sgi-gray: CMD = framecrc -i $(TARGET_SAMPLES)/sgi/lena_gray.sgi -pix_fmt gray
|
||||
|
||||
FATE_SGI += fate-sgi-gray16
|
||||
fate-sgi-gray16: CMD = framecrc -i $(TARGET_SAMPLES)/sgi/lena_gray16.sgi -pix_fmt gray16
|
||||
fate-sgi-gray16: CMD = framecrc -i $(TARGET_SAMPLES)/sgi/lena_gray16.sgi -pix_fmt gray16le
|
||||
|
||||
FATE_SGI += fate-sgi-rgb24
|
||||
fate-sgi-rgb24: CMD = framecrc -i $(TARGET_SAMPLES)/sgi/lena_rgb24.sgi -pix_fmt rgb24
|
||||
|
Loading…
Reference in New Issue
Block a user