avformat/rmdec: Check size in ivr_read_packet() before use

[ffmpeg] / libavformat / oggparsedirac.c

diff --git a/libavformat/oggparsedirac.c b/libavformat/oggparsedirac.c
index a39ea4a31917cf9dcfc79d66e225c9e9a61483c6..3e5e3930b297709fb76f8b01cf54e7331f8e840d 100644 (file)
--- a/libavformat/oggparsedirac.c
+++ b/libavformat/oggparsedirac.c
@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/imgutils.h"
 #include "libavutil/intreadwrite.h"
 #include "libavcodec/dirac.h"
 #include "avformat.h"
@@ -51,6 +52,8 @@ static int dirac_header(AVFormatContext *s, int idx)
     st->codec->colorspace      = dsh->colorspace;
     st->codec->profile         = dsh->profile;
     st->codec->level           = dsh->level;
+    if (av_image_check_sar(st->codec->width, st->codec->height, dsh->sample_aspect_ratio) >= 0)
+        st->sample_aspect_ratio = dsh->sample_aspect_ratio;
 
     // dirac in ogg always stores timestamps as though the video were interlaced
     avpriv_set_pts_info(st, 64, dsh->framerate.den, 2 * dsh->framerate.num);