build error for old ffmpeg.

avpicture_fill 2nd is not const in some versions.
stormysky · Mar 10, 2014 · c94dbb8 · c94dbb8
1 parent 305c3ce
commit c94dbb8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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);
 }