Commit 7194da21 authored by Dmitry Kovalev's avatar Dmitry Kovalev Committed by Gerrit Code Review
Browse files

Merge "Fixing display size setting problem."

parents 13930cf5 11e3ac62
...@@ -549,8 +549,8 @@ static void setup_frame_size(VP9D_COMP *pbi, ...@@ -549,8 +549,8 @@ static void setup_frame_size(VP9D_COMP *pbi,
struct vp9_read_bit_buffer *rb) { struct vp9_read_bit_buffer *rb) {
int width, height; int width, height;
read_frame_size(rb, &width, &height); read_frame_size(rb, &width, &height);
setup_display_size(&pbi->common, rb);
apply_frame_size(pbi, width, height); apply_frame_size(pbi, width, height);
setup_display_size(&pbi->common, rb);
} }
static void setup_frame_size_with_refs(VP9D_COMP *pbi, static void setup_frame_size_with_refs(VP9D_COMP *pbi,
...@@ -576,8 +576,8 @@ 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, vpx_internal_error(&cm->error, VPX_CODEC_CORRUPT_FRAME,
"Referenced frame with invalid size"); "Referenced frame with invalid size");
setup_display_size(cm, rb);
apply_frame_size(pbi, width, height); apply_frame_size(pbi, width, height);
setup_display_size(cm, rb);
} }
static void decode_tile(VP9D_COMP *pbi, vp9_reader *r) { static void decode_tile(VP9D_COMP *pbi, vp9_reader *r) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment