diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-24 12:04:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-24 12:15:56 +0200 |
| commit | 029353e427dab092444008085ac330009a1707bd (patch) | |
| tree | 8d2bbfcd2e955e8745c6b544f4e14730cbb98e1b /tests/fate/lossless-audio.mak | |
| parent | cf6ed1f1293c2dd69b76d9246a916925b58b7bbf (diff) | |
| parent | e9e5a1bdc769a7225ab0d4f8b33bcacc6496bd68 (diff) | |
Merge commit 'e9e5a1bdc769a7225ab0d4f8b33bcacc6496bd68'
* commit 'e9e5a1bdc769a7225ab0d4f8b33bcacc6496bd68':
Monkey's Audio old versions FATE tests
h264_parser: Set field_order and picture_structure.
Conflicts:
libavcodec/h264_parser.c
tests/fate/lossless-audio.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/lossless-audio.mak')
| -rw-r--r-- | tests/fate/lossless-audio.mak | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/tests/fate/lossless-audio.mak b/tests/fate/lossless-audio.mak index 8dc0f06334..486920d7c5 100644 --- a/tests/fate/lossless-audio.mak +++ b/tests/fate/lossless-audio.mak @@ -4,9 +4,6 @@ fate-lossless-alac: CMD = md5 -i $(SAMPLES)/lossless-audio/inside.m4a -f s16le FATE_SAMPLES_LOSSLESS_AUDIO-$(call DEMDEC, MLP, MLP) += fate-lossless-meridianaudio fate-lossless-meridianaudio: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.mlp -f s16le -FATE_SAMPLES_LOSSLESS_AUDIO-$(call DEMDEC, APE, APE) += fate-lossless-monkeysaudio -fate-lossless-monkeysaudio: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.ape -f s16le - FATE_SAMPLES_LOSSLESS_AUDIO-$(call DEMDEC, RM, RALF) += fate-ralf fate-ralf: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.rmvb -vn -f s16le |