diff options
| author | Clément Bœsch <u@pkh.me> | 2016-07-29 10:24:42 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2016-07-29 10:24:42 +0200 |
| commit | cc0852bee3608cd4b0cadb2ea4b7e58a22aa3c0e (patch) | |
| tree | cc07517ecab0bddc37920011a9a251ec5e3fc760 /libavcodec | |
| parent | 13872d2aa1f454f103e501b91417c44f0f184d53 (diff) | |
| parent | 19446dc5fff6a2f5ccd1a73db66e266255a5d768 (diff) | |
| download | ffmpeg-cc0852bee3608cd4b0cadb2ea4b7e58a22aa3c0e.tar.gz | |
Merge commit '19446dc5fff6a2f5ccd1a73db66e266255a5d768'
* commit '19446dc5fff6a2f5ccd1a73db66e266255a5d768':
h264: drop unused NAL_FF_IGNORE
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264.c | 2 | ||||
| -rw-r--r-- | libavcodec/h264.h | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index db68c05722..c2c8727bf6 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 210b2b2eda..3413acef01 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, }; /** |