Merge commit '19446dc5fff6a2f5ccd1a73db66e266255a5d768'

* commit '19446dc5fff6a2f5ccd1a73db66e266255a5d768': h264: drop unused NAL_FF_IGNORE Merged-by: Clément Bœsch <u@pkh.me>
8 years ago · cc0852bee3
parent 13872d2aa1 19446dc5ff
commit cc0852bee3
2 changed files with 0 additions and 3 deletions
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@ -1062,8 +1062,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
        case NAL_SPS_EXT:
        case NAL_AUXILIARY_SLICE:
            break;
-        case NAL_FF_IGNORE:
-            break;
        default:
            av_log(avctx, AV_LOG_DEBUG, "Unknown NAL code: %d (%d bits)\n",
                   nal->type, nal->size_bits);
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@ -127,7 +127,6 @@ enum {
    NAL_FILLER_DATA     = 12,
    NAL_SPS_EXT         = 13,
    NAL_AUXILIARY_SLICE = 19,
-    NAL_FF_IGNORE       = 0xff0f001,
 };

 /**