Merge commit '2e55e26b40e269816bba54da7d0e03955731b8fe'

[ffmpeg] / libavformat / hevcdec.c

diff --git a/libavformat/hevcdec.c b/libavformat/hevcdec.c
index e36a0513e3f4a2391af98ab4230ad0bc06c6a7d1..aaab0ffa2f604222c4ea60ecf4df445fe0c32044 100644 (file)
--- a/libavformat/hevcdec.c
+++ b/libavformat/hevcdec.c
@@ -43,15 +43,15 @@ static int hevc_probe(AVProbeData *p)
                 return 0;
 
             switch (type) {
-            case NAL_VPS:        vps++;  break;
-            case NAL_SPS:        sps++;  break;
-            case NAL_PPS:        pps++;  break;
-            case NAL_BLA_N_LP:
-            case NAL_BLA_W_LP:
-            case NAL_BLA_W_RADL:
-            case NAL_CRA_NUT:
-            case NAL_IDR_N_LP:
-            case NAL_IDR_W_RADL: irap++; break;
+            case HEVC_NAL_VPS:        vps++;  break;
+            case HEVC_NAL_SPS:        sps++;  break;
+            case HEVC_NAL_PPS:        pps++;  break;
+            case HEVC_NAL_BLA_N_LP:
+            case HEVC_NAL_BLA_W_LP:
+            case HEVC_NAL_BLA_W_RADL:
+            case HEVC_NAL_CRA_NUT:
+            case HEVC_NAL_IDR_N_LP:
+            case HEVC_NAL_IDR_W_RADL: irap++; break;
             }
         }
     }