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_slice.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_slice.c')
| -rw-r--r-- | libavcodec/h264_slice.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index af52cf6892..f0f0a50a55 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1228,7 +1228,7 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) } else sl->slice_type_fixed = 0; - slice_type = golomb_to_pict_type[slice_type]; + slice_type = ff_h264_golomb_to_pict_type[slice_type]; sl->slice_type = slice_type; sl->slice_type_nos = slice_type & 3; |