[FFmpeg-cvslog] hevc: zero the correct variables on invalid crop parameters

Anton Khirnov git at videolan.org
Sun Mar 29 03:26:04 CEST 2015


ffmpeg | branch: release/2.4 | Anton Khirnov <anton at khirnov.net> | Fri Mar 20 21:30:29 2015 +0100| [a529f6648ed450f7e846a0e704a0a3260aaa4b62] | committer: Anton Khirnov

hevc: zero the correct variables on invalid crop parameters

It's the output_window that is applied to the output frame, not
pic_conf_win

(cherry picked from commit 5127c00b971b674f72609369b39a9c0f7c36977d)
Signed-off-by: Anton Khirnov <anton at khirnov.net>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a529f6648ed450f7e846a0e704a0a3260aaa4b62
---

 libavcodec/hevc_ps.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c
index bc18990..db658be 100644
--- a/libavcodec/hevc_ps.c
+++ b/libavcodec/hevc_ps.c
@@ -883,10 +883,10 @@ int ff_hevc_decode_nal_sps(HEVCContext *s)
         }
         av_log(s->avctx, AV_LOG_WARNING,
                "Displaying the whole video surface.\n");
-        sps->pic_conf_win.left_offset   =
-        sps->pic_conf_win.right_offset  =
-        sps->pic_conf_win.top_offset    =
-        sps->pic_conf_win.bottom_offset = 0;
+        sps->output_window.left_offset   =
+        sps->output_window.right_offset  =
+        sps->output_window.top_offset    =
+        sps->output_window.bottom_offset = 0;
         sps->output_width               = sps->width;
         sps->output_height              = sps->height;
     }



More information about the ffmpeg-cvslog mailing list