Mercurial > libavcodec.hg
comparison h264.c @ 2580:b4f6f89ec2f6 libavcodec
The cvs version 1.103 of h264.c brokes 13 conformance streams, this
patch corrects this and decodes the same streams as version 1.102.
patch by (Lo«Ác Le Loarer <lll+ffmpeg m4x org>)
| author | michael |
|---|---|
| date | Sun, 27 Mar 2005 00:27:37 +0000 |
| parents | eb72c01df6ed |
| children | ae72796e722f |
comparison
equal
deleted
inserted
replaced
| 2579:e027765cf410 | 2580:b4f6f89ec2f6 |
|---|---|
| 3760 else if(h->pps.weighted_bipred_idc==2 && h->slice_type==B_TYPE) | 3760 else if(h->pps.weighted_bipred_idc==2 && h->slice_type==B_TYPE) |
| 3761 implicit_weight_table(h); | 3761 implicit_weight_table(h); |
| 3762 else | 3762 else |
| 3763 h->use_weight = 0; | 3763 h->use_weight = 0; |
| 3764 | 3764 |
| 3765 if(s->current_picture.reference == 3) | 3765 if(s->current_picture.reference) |
| 3766 decode_ref_pic_marking(h); | 3766 decode_ref_pic_marking(h); |
| 3767 | 3767 |
| 3768 if( h->slice_type != I_TYPE && h->slice_type != SI_TYPE && h->pps.cabac ) | 3768 if( h->slice_type != I_TYPE && h->slice_type != SI_TYPE && h->pps.cabac ) |
| 3769 h->cabac_init_idc = get_ue_golomb(&s->gb); | 3769 h->cabac_init_idc = get_ue_golomb(&s->gb); |
| 3770 | 3770 |