[FFmpeg-cvslog] Merge commit '19446dc5fff6a2f5ccd1a73db66e266255a5d768'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Fri Jul 29 10:24:42 2016 +0200| [cc0852bee3608cd4b0cadb2ea4b7e58a22aa3c0e] | committer: Clément Bœsch

Merge commit '19446dc5fff6a2f5ccd1a73db66e266255a5d768'

* commit '19446dc5fff6a2f5ccd1a73db66e266255a5d768':
  h264: drop unused NAL_FF_IGNORE

Merged-by: Clément Bœsch <u at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cc0852bee3608cd4b0cadb2ea4b7e58a22aa3c0e
---

 libavcodec/h264.c | 2 --
 libavcodec/h264.h | 1 -
 2 files changed, 3 deletions(-)

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index db68c05..c2c8727 100644
--- 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);
diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index 210b2b2..3413ace 100644
--- 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,
 };
 
 /**


======================================================================