diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-24 11:54:53 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-24 11:54:53 +0100 |
| commit | 9809371aa5402d724cfaf74236bfe2ddb9829676 (patch) | |
| tree | 921c9142acc9c15aa61db94deff890c85904df52 /libavcodec/h264_parser.c | |
| parent | a5a6621616aac55b8284002af4fef35b66e2b2d1 (diff) | |
| parent | a7da517f6a5c472f46f67dd33bb6b95ccc919923 (diff) | |
Merge commit 'a7da517f6a5c472f46f67dd33bb6b95ccc919923'
* commit 'a7da517f6a5c472f46f67dd33bb6b95ccc919923':
h264data: Move all data tables from a header to a .c file
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/h264_parser.c')
| -rw-r--r-- | libavcodec/h264_parser.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c index cbf5b3a4da..9a06d61cf2 100644 --- a/libavcodec/h264_parser.c +++ b/libavcodec/h264_parser.c @@ -312,7 +312,7 @@ static inline int parse_nal_units(AVCodecParserContext *s, init_get_bits(&sl->gb, ptr, 8 * dst_length); get_ue_golomb_long(&sl->gb); // skip first_mb_in_slice slice_type = get_ue_golomb_31(&sl->gb); - s->pict_type = golomb_to_pict_type[slice_type % 5]; + s->pict_type = ff_h264_golomb_to_pict_type[slice_type % 5]; if (h->sei_recovery_frame_cnt >= 0) { /* key frame, since recovery_frame_cnt is set */ s->key_frame = 1; |