aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/dvdsubdec.c
diff options
context:
space:
mode:
authorClément Bœsch <ubitux@gmail.com>2012-09-04 17:49:15 +0200
committerClément Bœsch <ubitux@gmail.com>2012-09-04 23:38:29 +0200
commit3b6e9cd7ec72e3bd17aed4e053cef4c6a349d3db (patch)
tree498b47831df637393f883338e5cc6929df3ea346 /libavcodec/dvdsubdec.c
parentd83ff76ca0e1ec905ca2d5b27bd0973991eadbd9 (diff)
downloadffmpeg-3b6e9cd7ec72e3bd17aed4e053cef4c6a349d3db.tar.gz
lavc/dvdsubdec: parse the size from the extradata.
Diffstat (limited to 'libavcodec/dvdsubdec.c')
-rw-r--r--libavcodec/dvdsubdec.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c
index 3eba2dfce9..90593d0833 100644
--- a/libavcodec/dvdsubdec.c
+++ b/libavcodec/dvdsubdec.c
@@ -22,6 +22,7 @@
#include "get_bits.h"
#include "dsputil.h"
#include "libavutil/colorspace.h"
+#include "libavutil/imgutils.h"
//#define DEBUG
@@ -540,6 +541,11 @@ static int dvdsub_init(AVCodecContext *avctx)
while(*p == ',' || isspace(*p))
p++;
}
+ } else if (strncmp("size:", data, 5) == 0) {
+ int w, h;
+ if (sscanf(data + 5, "%dx%d", &w, &h) == 2 &&
+ av_image_check_size(w, h, 0, avctx) >= 0)
+ avcodec_set_dimensions(avctx, w, h);
}
data += pos;