[FFmpeg-cvslog] libutvideo: Unbreak

Derek Buitenhuis git at videolan.org
Wed Feb 3 20:27:56 CET 2016


ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Wed Feb  3 19:27:24 2016 +0000| [0ea716f70b0fe23d0abc7cf3669ae4a130b43637] | committer: Derek Buitenhuis

libutvideo: Unbreak

Signed-off-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0ea716f70b0fe23d0abc7cf3669ae4a130b43637
---

 libavcodec/libutvideoenc.cpp |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/libavcodec/libutvideoenc.cpp b/libavcodec/libutvideoenc.cpp
index 7a2c37f..a90a955 100644
--- a/libavcodec/libutvideoenc.cpp
+++ b/libavcodec/libutvideoenc.cpp
@@ -26,6 +26,7 @@
  */
 
 extern "C" {
+#include "libavutil/opt.h"
 #include "libavutil/avassert.h"
 #include "libavutil/imgutils.h"
 #include "avcodec.h"
@@ -86,7 +87,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
         return AVERROR(EINVAL);
     }
 
-    flags = ((avctx->prediction_method + 1) << 8) | (avctx->thread_count - 1);
+    flags = ((utv->pred + 1) << 8) | (avctx->thread_count - 1);
 
     avctx->priv_data = utv;
 
@@ -236,13 +237,13 @@ static const AVOption options[] = {
 static const AVClass utvideo_class = {
     "libutvideo",
     av_default_item_name,
-    options.
-    LIBAVUTIL_VERSION,
+    options,
+    LIBAVUTIL_VERSION_INT,
     0,
     0,
     NULL,
     NULL,
-    0,
+    AV_CLASS_CATEGORY_NA,
     NULL,
     NULL,
 };



More information about the ffmpeg-cvslog mailing list