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/Makefile | |
| 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/Makefile')
| -rw-r--r-- | tests/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/Makefile b/tests/Makefile index 99be14fc77..cd8c1e2821 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -100,6 +100,7 @@ include $(SRC_PATH)/tests/fate/libavutil.mak include $(SRC_PATH)/tests/fate/lossless-audio.mak include $(SRC_PATH)/tests/fate/lossless-video.mak include $(SRC_PATH)/tests/fate/microsoft.mak +include $(SRC_PATH)/tests/fate/monkeysaudio.mak include $(SRC_PATH)/tests/fate/mp3.mak include $(SRC_PATH)/tests/fate/mpc.mak include $(SRC_PATH)/tests/fate/pcm.mak |