virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Merge commit '19446dc5fff6a2f5ccd1a73db66e266255a5d768'

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

Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
Clément Bœsch
2016-07-29 10:24:42 +02:00
parent 13872d2aa1 19446dc5ff
commit cc0852bee3
2 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/h264.c
View File

@@ -1062,8 +1062,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
case NAL_SPS_EXT: case NAL_SPS_EXT:
case NAL_AUXILIARY_SLICE: case NAL_AUXILIARY_SLICE:
break; break;
case NAL_FF_IGNORE:
break;
default: default:
av_log(avctx, AV_LOG_DEBUG, "Unknown NAL code: %d (%d bits)\n", av_log(avctx, AV_LOG_DEBUG, "Unknown NAL code: %d (%d bits)\n",
nal->type, nal->size_bits); nal->type, nal->size_bits);

1
libavcodec/h264.h
View File

@@ -127,7 +127,6 @@ enum {
NAL_FILLER_DATA = 12, NAL_FILLER_DATA = 12,
NAL_SPS_EXT = 13, NAL_SPS_EXT = 13,
NAL_AUXILIARY_SLICE = 19, NAL_AUXILIARY_SLICE = 19,
NAL_FF_IGNORE = 0xff0f001,
}; };
/** /**