Merge commit '00cc10aee380f882507bac994ac469d8358d12e8'

[ffmpeg] / libavcodec / mpegpicture.h

diff --git a/libavcodec/mpegpicture.h b/libavcodec/mpegpicture.h
index 0a48d690c4138fd343d31de67ffbf8894c48b4b6..2db3d6733a82066531dbb47a26093dfe383116e8 100644 (file)
--- a/libavcodec/mpegpicture.h
+++ b/libavcodec/mpegpicture.h
@@ -87,7 +87,7 @@ typedef struct Picture {
     int reference;
     int shared;
 
-    uint64_t error[AV_NUM_DATA_POINTERS];
+    uint64_t encoding_error[AV_NUM_DATA_POINTERS];
 } Picture;
 
 /**