Merge commit 'c0b105756f61d253bdabcc2bb49453a2557e7c3b'

[ffmpeg] / libavcodec / h264.h

diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index 95db912465b893dfa2299f0861a357308147c56f..548510d793016ea8939cbd058a54345cc4877c60 100644 (file)
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -519,6 +519,14 @@ typedef struct H264Context {
     int width, height;
     int chroma_x_shift, chroma_y_shift;
 
+    /**
+     * Backup frame properties: needed, because they can be different
+     * between returned frame and last decoded frame.
+     **/
+    int backup_width;
+    int backup_height;
+    enum AVPixelFormat backup_pix_fmt;
+
     int droppable;
     int coded_picture_number;
     int low_delay;