diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-03 21:28:07 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-03 21:28:07 -0300 |
| commit | a2b0602cdad8da62c137f7db07b608d6bbbcefaa (patch) | |
| tree | 67220614b5797dc9bd6ea58244a1a2e1e2e3197b /tests/fate/prores.mak | |
| parent | 08c751309670854c73b58f234a83f4ba679370be (diff) | |
| parent | 4141a5a240fba44b4b4a1c488c279d7dd8a11ec7 (diff) | |
| download | ffmpeg-a2b0602cdad8da62c137f7db07b608d6bbbcefaa.tar.gz | |
Merge commit '4141a5a240fba44b4b4a1c488c279d7dd8a11ec7'
* commit '4141a5a240fba44b4b4a1c488c279d7dd8a11ec7':
Use modern avconv syntax for codec selection in documentation and tests
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'tests/fate/prores.mak')
| -rw-r--r-- | tests/fate/prores.mak | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/fate/prores.mak b/tests/fate/prores.mak index fe1e7724d5..f7f52ca7fc 100644 --- a/tests/fate/prores.mak +++ b/tests/fate/prores.mak @@ -19,4 +19,4 @@ fate-prores-alpha: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/pror fate-prores-alpha_skip: CMD = framecrc -flags +bitexact -skip_alpha 1 -i $(TARGET_SAMPLES)/prores/Sequence_1-Apple_ProRes_with_Alpha.mov -pix_fmt yuv444p10le fate-prores-transparency: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/prores/prores4444_with_transparency.mov -pix_fmt yuva444p10le fate-prores-transparency_skip: CMD = framecrc -flags +bitexact -skip_alpha 1 -i $(TARGET_SAMPLES)/prores/prores4444_with_transparency.mov -pix_fmt yuv444p10le -fate-prores-gray: CMD = framecrc -flags +bitexact -acodec aac_fixed -i $(TARGET_SAMPLES)/prores/gray.mov -pix_fmt yuv422p10le +fate-prores-gray: CMD = framecrc -flags +bitexact -c:a aac_fixed -i $(TARGET_SAMPLES)/prores/gray.mov -pix_fmt yuv422p10le |