aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/mpegpicture.h
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2015-10-03 09:52:39 +0200
committerHendrik Leppkes <h.leppkes@gmail.com>2015-10-03 09:52:39 +0200
commit5fa5e73e81f191be0c4761bb4c517fdd39aff82e (patch)
tree139e9170b7999ffe132e33a2a3b782d2d99c07f4 /libavcodec/mpegpicture.h
parent59b55619b6edef363532825c4cf16ac2bfdd21a1 (diff)
parent1aa24df74c052a73175c43e57d35b4835e537ec8 (diff)
downloadffmpeg-5fa5e73e81f191be0c4761bb4c517fdd39aff82e.tar.gz
Merge commit '1aa24df74c052a73175c43e57d35b4835e537ec8'
* commit '1aa24df74c052a73175c43e57d35b4835e537ec8': lavu: Deprecate AVFrame.error[] Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/mpegpicture.h')
-rw-r--r--libavcodec/mpegpicture.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpegpicture.h b/libavcodec/mpegpicture.h
index 0a48d690c4..2db3d6733a 100644
--- 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;
/**