Mercurial > libavcodec.hg
comparison h264.c @ 7974:2b20ad98e424 libavcodec
Rename copy_picture to ff_copy_picture.
author | cehoyos |
---|---|
date | Thu, 02 Oct 2008 00:27:09 +0000 |
parents | 7d897cb94a31 |
children | 2dfff0e25b47 |
comparison
equal
deleted
inserted
replaced
7973:fb9a51e5d116 | 7974:2b20ad98e424 |
---|---|
3919 if(h->slice_type_nos!=FF_I_TYPE && decode_ref_pic_list_reordering(h) < 0) | 3919 if(h->slice_type_nos!=FF_I_TYPE && decode_ref_pic_list_reordering(h) < 0) |
3920 return -1; | 3920 return -1; |
3921 | 3921 |
3922 if(h->slice_type_nos!=FF_I_TYPE){ | 3922 if(h->slice_type_nos!=FF_I_TYPE){ |
3923 s->last_picture_ptr= &h->ref_list[0][0]; | 3923 s->last_picture_ptr= &h->ref_list[0][0]; |
3924 copy_picture(&s->last_picture, s->last_picture_ptr); | 3924 ff_copy_picture(&s->last_picture, s->last_picture_ptr); |
3925 } | 3925 } |
3926 if(h->slice_type_nos==FF_B_TYPE){ | 3926 if(h->slice_type_nos==FF_B_TYPE){ |
3927 s->next_picture_ptr= &h->ref_list[1][0]; | 3927 s->next_picture_ptr= &h->ref_list[1][0]; |
3928 copy_picture(&s->next_picture, s->next_picture_ptr); | 3928 ff_copy_picture(&s->next_picture, s->next_picture_ptr); |
3929 } | 3929 } |
3930 | 3930 |
3931 if( (h->pps.weighted_pred && h->slice_type_nos == FF_P_TYPE ) | 3931 if( (h->pps.weighted_pred && h->slice_type_nos == FF_P_TYPE ) |
3932 || (h->pps.weighted_bipred_idc==1 && h->slice_type_nos== FF_B_TYPE ) ) | 3932 || (h->pps.weighted_bipred_idc==1 && h->slice_type_nos== FF_B_TYPE ) ) |
3933 pred_weight_table(h); | 3933 pred_weight_table(h); |