Mercurial > libavcodec.hg
comparison mpegvideo_enc.c @ 9721:5d0f71ba8648 libavcodec
Rename alloc_picture to ff_alloc_picture and move its definition
in mpegvideo.h to avoid including mpegvideo_common.h in mpeg12.c,
because it contains motion code.
| author | bcoudurier |
|---|---|
| date | Wed, 27 May 2009 19:55:35 +0000 |
| parents | cc0380d2bbc3 |
| children | 0bfb23c7633d |
comparison
equal
deleted
inserted
replaced
| 9720:d6a35d7be925 | 9721:5d0f71ba8648 |
|---|---|
| 815 | 815 |
| 816 for(i=0; i<4; i++){ | 816 for(i=0; i<4; i++){ |
| 817 pic->data[i]= pic_arg->data[i]; | 817 pic->data[i]= pic_arg->data[i]; |
| 818 pic->linesize[i]= pic_arg->linesize[i]; | 818 pic->linesize[i]= pic_arg->linesize[i]; |
| 819 } | 819 } |
| 820 alloc_picture(s, (Picture*)pic, 1); | 820 ff_alloc_picture(s, (Picture*)pic, 1); |
| 821 }else{ | 821 }else{ |
| 822 i= ff_find_unused_picture(s, 0); | 822 i= ff_find_unused_picture(s, 0); |
| 823 | 823 |
| 824 pic= (AVFrame*)&s->picture[i]; | 824 pic= (AVFrame*)&s->picture[i]; |
| 825 pic->reference= 3; | 825 pic->reference= 3; |
| 826 | 826 |
| 827 alloc_picture(s, (Picture*)pic, 0); | 827 ff_alloc_picture(s, (Picture*)pic, 0); |
| 828 | 828 |
| 829 if( pic->data[0] + INPLACE_OFFSET == pic_arg->data[0] | 829 if( pic->data[0] + INPLACE_OFFSET == pic_arg->data[0] |
| 830 && pic->data[1] + INPLACE_OFFSET == pic_arg->data[1] | 830 && pic->data[1] + INPLACE_OFFSET == pic_arg->data[1] |
| 831 && pic->data[2] + INPLACE_OFFSET == pic_arg->data[2]){ | 831 && pic->data[2] + INPLACE_OFFSET == pic_arg->data[2]){ |
| 832 // empty | 832 // empty |
| 1148 | 1148 |
| 1149 int i= ff_find_unused_picture(s, 0); | 1149 int i= ff_find_unused_picture(s, 0); |
| 1150 Picture *pic= &s->picture[i]; | 1150 Picture *pic= &s->picture[i]; |
| 1151 | 1151 |
| 1152 pic->reference = s->reordered_input_picture[0]->reference; | 1152 pic->reference = s->reordered_input_picture[0]->reference; |
| 1153 alloc_picture(s, pic, 0); | 1153 ff_alloc_picture(s, pic, 0); |
| 1154 | 1154 |
| 1155 /* mark us unused / free shared pic */ | 1155 /* mark us unused / free shared pic */ |
| 1156 if(s->reordered_input_picture[0]->type == FF_BUFFER_TYPE_INTERNAL) | 1156 if(s->reordered_input_picture[0]->type == FF_BUFFER_TYPE_INTERNAL) |
| 1157 s->avctx->release_buffer(s->avctx, (AVFrame*)s->reordered_input_picture[0]); | 1157 s->avctx->release_buffer(s->avctx, (AVFrame*)s->reordered_input_picture[0]); |
| 1158 for(i=0; i<4; i++) | 1158 for(i=0; i<4; i++) |