OSDN Git Service

h264_parser: use enum values in h264_find_frame_end()
authorVittorio Giovara <vittorio.giovara@gmail.com>
Fri, 14 Feb 2014 04:20:02 +0000 (05:20 +0100)
committerVittorio Giovara <vittorio.giovara@gmail.com>
Sat, 15 Feb 2014 17:29:49 +0000 (18:29 +0100)
libavcodec/h264_parser.c

index b086707..a16229a 100644 (file)
@@ -58,13 +58,15 @@ static int h264_find_frame_end(H264Context *h, const uint8_t *buf,
             else
                 state >>= 1;           // 2->1, 1->0, 0->0
         } else if (state <= 5) {
-            int v = buf[i] & 0x1F;
-            if (v == 6 || v == 7 || v == 8 || v == 9) {
+            int nalu_type = buf[i] & 0x1F;
+            if (nalu_type == NAL_SEI || nalu_type == NAL_SPS ||
+                nalu_type == NAL_PPS || nalu_type == NAL_AUD) {
                 if (pc->frame_start_found) {
                     i++;
                     goto found;
                 }
-            } else if (v == 1 || v == 2 || v == 5) {
+            } else if (nalu_type == NAL_SLICE || nalu_type == NAL_DPA ||
+                       nalu_type == NAL_IDR_SLICE) {
                 if (pc->frame_start_found) {
                     state += 8;
                     continue;