From c94dbb8e4bb2d40b21099f7f02efaaf286e1cf4e Mon Sep 17 00:00:00 2001
From: wang-bin <wbsecg1@gmail.com>
Date: Mon, 10 Mar 2014 19:18:33 +0800
Subject: [PATCH] build error for old ffmpeg.

avpicture_fill 2nd is not const in some versions.
---
 src/AudioFrame.cpp     | 4 +---
 src/ImageConverter.cpp | 2 +-
 src/VideoFrame.cpp     | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/AudioFrame.cpp b/src/AudioFrame.cpp
index 0dbde45e..222b91ff 100644
--- a/src/AudioFrame.cpp
+++ b/src/AudioFrame.cpp
@@ -22,10 +22,8 @@
 #include "QtAV/AudioFrame.h"
 #include "private/Frame_p.h"
 #include "QtAV/AudioResampler.h"
+#include "QtAV/QtAV_Compat.h"
 
-extern "C" {
-#include <libavutil/samplefmt.h>
-}
 
 namespace QtAV {
 
diff --git a/src/ImageConverter.cpp b/src/ImageConverter.cpp
index ef7446d1..af53ef25 100644
--- a/src/ImageConverter.cpp
+++ b/src/ImageConverter.cpp
@@ -211,7 +211,7 @@ bool ImageConverter::prepareData()
     //picture的数据按PIX_FMT格式自动"关联"到 data
     avpicture_fill(
             &d.picture,
-            (const uint8_t*)d.data_out.constData(),
+            (uint8_t*)d.data_out.constData(),
             (AVPixelFormat)d.fmt_out,
             d.w_out,
             d.h_out
diff --git a/src/VideoFrame.cpp b/src/VideoFrame.cpp
index 870f10aa..94a2d49d 100644
--- a/src/VideoFrame.cpp
+++ b/src/VideoFrame.cpp
@@ -349,7 +349,7 @@ void VideoFrame::init()
     AVPixelFormat fff = (AVPixelFormat)d->format.pixelFormatFFmpeg();
     //int bytes = avpicture_get_size(fff, width(), height());
     //d->data.resize(bytes);
-    avpicture_fill(&picture, (const uint8_t*)d->data.constData(), fff, width(), height());
+    avpicture_fill(&picture, (uint8_t*)d->data.constData(), fff, width(), height());
     setBits(picture.data);
     setBytesPerLine(picture.linesize);
 }