diff options
| author | Paul Kendall <paul@kcbbs.gen.nz> | 2008-07-26 15:07:04 +0000 |
|---|---|---|
| committer | Jason Garrett-Glaser <darkshikari@gmail.com> | 2008-07-26 15:07:04 +0000 |
| commit | 4a1aa38bdaccf72374937617912d07a3d173dcf1 (patch) | |
| tree | e0baf5f4abdfedf4e28141b5a354d58d5d6060ef /libavcodec | |
| parent | efa86ebe4ce257b654e26427a89d51f8223aa347 (diff) | |
| download | ffmpeg-4a1aa38bdaccf72374937617912d07a3d173dcf1.tar.gz | |
Simple refactoring to resolve a FIXME. Patch by Paul Kendall.
Originally committed as revision 14419 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -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 99785d0a8b..6adc1e3d91 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2911,7 +2911,6 @@ static int decode_ref_pic_list_reordering(H264Context *h){ print_short_term(h); print_long_term(h); - if(h->slice_type_nos==FF_I_TYPE) return 0; //FIXME move before function for(list=0; list<h->list_count; list++){ memcpy(h->ref_list[list], h->default_ref_list[list], sizeof(Picture)*h->ref_count[list]); @@ -3988,7 +3987,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ fill_default_ref_list(h); } - if(decode_ref_pic_list_reordering(h) < 0) + if(h->slice_type_nos!=FF_I_TYPE && decode_ref_pic_list_reordering(h) < 0) return -1; if( (h->pps.weighted_pred && h->slice_type_nos == FF_P_TYPE ) |