h264dec: be more explicit in handling container cropping

The current condition can trigger in cases where it shouldn't, with
unexpected results.
Make sure that:
- container cropping is really based on the original dimensions from the
  caller
- those dimenions are discarded on size change

The code is still quite hacky and eventually should be deprecated and
removed, with the decision about which cropping is used delegated to the
caller.

1 files changed, 5 insertions, 0 deletions

diff --git a/libavcodec/h264dec.h b/libavcodec/h264dec.h
index 5957e79..0a9896a 100644
--- a/libavcodec/h264dec.h
+++ b/libavcodec/h264dec.h
@@ -514,6 +514,11 @@ typedef struct H264Context {
      * the slice data */
     int field_started;
 
+    /* original AVCodecContext dimensions, used to handle container
+     * cropping */
+    int width_from_caller;
+    int height_from_caller;
+
     AVFrame *output_frame;
 
     int enable_er;