Merge commit '13bddab7de10aebf6efb98aa6d7ff0c51bb0e364'

* commit '13bddab7de10aebf6efb98aa6d7ff0c51bb0e364':
  nuv: Replace avpicture functions with imgutils

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2015-10-22 20:32:07 +02:00
commit 422fab7fbe
1 changed files with 6 additions and 3 deletions

View File

@ -75,9 +75,12 @@ static const uint8_t fallback_cquant[] = {
*/
static void copy_frame(AVFrame *f, const uint8_t *src, int width, int height)
{
AVPicture pic;
avpicture_fill(&pic, src, AV_PIX_FMT_YUV420P, width, height);
av_picture_copy((AVPicture *)f, &pic, AV_PIX_FMT_YUV420P, width, height);
uint8_t *src_data[4];
int src_linesize[4];
av_image_fill_arrays(src_data, src_linesize, src,
f->format, width, height, 1);
av_image_copy(f->data, f->linesize, src_data, src_linesize,
f->format, width, height);
}
/**