Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-01-06 16:24:37 +0400
committerMichael Niedermayer <michaelni@gmx.at>2014-01-06 16:24:48 +0400
commit8d86e7b495896946f5e3c8751f06b2fd11d8213c (patch)
tree3782a5f0f619047270b9682591e792743272f987 /tests/fate
parent0db6402d9116b826fdf7f35409d229358ad81fd3 (diff)
parent060667195e6e6bc0fa63ce13c47e23aabe70d122 (diff)
Merge commit '060667195e6e6bc0fa63ce13c47e23aabe70d122'
* commit '060667195e6e6bc0fa63ce13c47e23aabe70d122': hevc: rename some HEVC conformance streams Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate')
-rw-r--r--tests/fate/hevc.mak12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/fate/hevc.mak b/tests/fate/hevc.mak
index c1e6d8fde9..278d190254 100644
--- a/tests/fate/hevc.mak
+++ b/tests/fate/hevc.mak
@@ -16,7 +16,7 @@ HEVC_SAMPLES = \
CAINIT_G_SHARP_3 \
CAINIT_H_SHARP_3 \
CIP_A_Panasonic_3 \
- cip_B_NEC_2 \
+ cip_B_NEC_3 \
CIP_C_Panasonic_2 \
DBLK_A_SONY_3 \
DBLK_B_SONY_3 \
@@ -38,16 +38,16 @@ HEVC_SAMPLES = \
ENTP_B_LG_2 \
ENTP_C_LG_3 \
EXT_A_ericsson_3 \
- ipcm_A_NEC_2 \
- ipcm_B_NEC_2 \
- ipcm_C_NEC_2 \
- ipcm_D_NEC_2 \
+ ipcm_A_NEC_3 \
+ ipcm_B_NEC_3 \
+ ipcm_C_NEC_3 \
+ ipcm_D_NEC_3 \
ipcm_E_NEC_2 \
IPRED_A_docomo_2 \
IPRED_B_Nokia_3 \
IPRED_C_Mitsubishi_2 \
LS_A_Orange_2 \
- LS_B_ORANGE_3 \
+ LS_B_ORANGE_4 \
MAXBINS_A_TI_4 \
MAXBINS_B_TI_4 \
MAXBINS_C_TI_4 \