Mercurial > libavcodec.hg
comparison mpegvideo.h @ 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 | 15660ad4c641 |
children | ffc0f9de5743 |
comparison
equal
deleted
inserted
replaced
9720:d6a35d7be925 | 9721:5d0f71ba8648 |
---|---|
709 const uint16_t *quant_matrix, int bias, int qmin, int qmax, int intra); | 709 const uint16_t *quant_matrix, int bias, int qmin, int qmax, int intra); |
710 | 710 |
711 void ff_init_block_index(MpegEncContext *s); | 711 void ff_init_block_index(MpegEncContext *s); |
712 void ff_copy_picture(Picture *dst, Picture *src); | 712 void ff_copy_picture(Picture *dst, Picture *src); |
713 | 713 |
714 /** | |
715 * allocates a Picture | |
716 * The pixels are allocated/set by calling get_buffer() if shared=0 | |
717 */ | |
718 int ff_alloc_picture(MpegEncContext *s, Picture *pic, int shared); | |
719 | |
714 extern const enum PixelFormat ff_pixfmt_list_420[]; | 720 extern const enum PixelFormat ff_pixfmt_list_420[]; |
715 extern const enum PixelFormat ff_hwaccel_pixfmt_list_420[]; | 721 extern const enum PixelFormat ff_hwaccel_pixfmt_list_420[]; |
716 | 722 |
717 static inline void ff_update_block_index(MpegEncContext *s){ | 723 static inline void ff_update_block_index(MpegEncContext *s){ |
718 const int block_size= 8>>s->avctx->lowres; | 724 const int block_size= 8>>s->avctx->lowres; |