Merge commit '060667195e6e6bc0fa63ce13c47e23aabe70d122'

* commit '060667195e6e6bc0fa63ce13c47e23aabe70d122':
  hevc: rename some HEVC conformance streams

Merged-by: Michael Niedermayer <michaelni@gmx.at>

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              \