aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-05-05 00:56:39 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-05-09 21:01:03 +0200
commit1ce3f736d2aa531af362d75f675efb11e36c5172 (patch)
treee385a88b1de654c2e15210ff5fa6a6d5aee5ceb2
parent4d0090f90a9775c7d18d887a97f05fdb01fc51e9 (diff)
downloadffmpeg-1ce3f736d2aa531af362d75f675efb11e36c5172.tar.gz
src_movie: fix scanf string
Fixes out of array accesses Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit adaa7743f5fdca0c0aca0b7ffdebf61c7d868571) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavfilter/src_movie.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c
index bd45766641..ec9131ecab 100644
--- a/libavfilter/src_movie.c
+++ b/libavfilter/src_movie.c
@@ -91,13 +91,13 @@ static int movie_request_frame(AVFilterLink *outlink);
static AVStream *find_stream(void *log, AVFormatContext *avf, const char *spec)
{
int i, ret, already = 0, stream_id = -1;
- char type_char, dummy;
+ char type_char[2], dummy;
AVStream *found = NULL;
enum AVMediaType type;
- ret = sscanf(spec, "d%[av]%d%c", &type_char, &stream_id, &dummy);
+ ret = sscanf(spec, "d%1[av]%d%c", type_char, &stream_id, &dummy);
if (ret >= 1 && ret <= 2) {
- type = type_char == 'v' ? AVMEDIA_TYPE_VIDEO : AVMEDIA_TYPE_AUDIO;
+ type = type_char[0] == 'v' ? AVMEDIA_TYPE_VIDEO : AVMEDIA_TYPE_AUDIO;
ret = av_find_best_stream(avf, type, stream_id, -1, NULL, 0);
if (ret < 0) {
av_log(log, AV_LOG_ERROR, "No %s stream with index '%d' found\n",