diff options
| author | Diego Biurrun <diego@biurrun.de> | 2008-11-24 15:53:16 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2008-11-24 15:53:16 +0000 |
| commit | ee2a957fbd64678cb5f27552fe47968cf44be8fd (patch) | |
| tree | 65b854c10e68767b79722fa8945355c114f6cf07 /libavcodec/h264.c | |
| parent | 7f8f4b40aaae781564095f164d51ee4e6ab808c2 (diff) | |
| download | ffmpeg-ee2a957fbd64678cb5f27552fe47968cf44be8fd.tar.gz | |
Use golomb_to_pict_type instead of its duplicate, slice_type_map.
Originally committed as revision 15926 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 915c0785ad..6782d7f076 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -3631,7 +3631,6 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ unsigned int first_mb_in_slice; unsigned int pps_id; int num_ref_idx_active_override_flag; - static const uint8_t slice_type_map[5]= {FF_P_TYPE, FF_B_TYPE, FF_I_TYPE, FF_SP_TYPE, FF_SI_TYPE}; unsigned int slice_type, tmp, i, j; int default_ref_list_done = 0; int last_pic_structure; @@ -3665,7 +3664,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ }else h->slice_type_fixed=0; - slice_type= slice_type_map[ slice_type ]; + slice_type= golomb_to_pict_type[ slice_type ]; if (slice_type == FF_I_TYPE || (h0->current_slice != 0 && slice_type == h0->last_slice_type) ) { default_ref_list_done = 1; |