Merge commit '324e50ee95929a9491b855c5e15451145bd5d1ec'

[ffmpeg] / libavcodec / snow.h

diff --git a/libavcodec/snow.h b/libavcodec/snow.h
index f5cbae37f26a72cbe2f718d68a87e052f5641d1c..95e07cd0aef096b82f23510a95068ef7c1fd49ec 100644 (file)
--- a/libavcodec/snow.h
+++ b/libavcodec/snow.h
@@ -175,6 +175,7 @@ typedef struct SnowContext{
     slice_buffer sb;
     int memc_only;
     int no_bitstream;
+    int intra_penalty;
 
     MpegEncContext m; // needed for motion estimation, should not be used for anything else, the idea is to eventually make the motion estimation independent of MpegEncContext, so this will be removed then (FIXME/XXX)