Fixing display size setting problem.

Fix of https://code.google.com/p/webm/issues/detail?id=608. We could have
used invalid display size equal to the previous frame size (not to the
current frame size).

Change-Id: I91b576be5032e47084214052a1990dc51213e2f0

diff --git a/vp9/decoder/vp9_decodframe.c b/vp9/decoder/vp9_decodframe.c
index ea61d871fc163ce26b4b24fa8e415b14d71804c8..3222c441309d2af442708759380b42d6e40aa076 100644 (file)
--- a/vp9/decoder/vp9_decodframe.c
+++ b/vp9/decoder/vp9_decodframe.c
@@ -549,8 +549,8 @@ static void setup_frame_size(VP9D_COMP *pbi,
                              struct vp9_read_bit_buffer *rb) {
   int width, height;
   read_frame_size(rb, &width, &height);
-  setup_display_size(&pbi->common, rb);
   apply_frame_size(pbi, width, height);
+  setup_display_size(&pbi->common, rb);
 }
 
 static void setup_frame_size_with_refs(VP9D_COMP *pbi,
@@ -576,8 +576,8 @@ static void setup_frame_size_with_refs(VP9D_COMP *pbi,
     vpx_internal_error(&cm->error, VPX_CODEC_CORRUPT_FRAME,
                        "Referenced frame with invalid size");
 
-  setup_display_size(cm, rb);
   apply_frame_size(pbi, width, height);
+  setup_display_size(cm, rb);
 }
 
 static void decode_tile(VP9D_COMP *pbi, vp9_reader *r) {