diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-28 12:03:00 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-28 12:03:06 +0200 |
commit | 946902e5b9c2574969ac239b2dfb4d88e069fa29 (patch) | |
tree | 148236dbf6b477452c0360f281cca90e963c5b58 | |
parent | a13af77f49d79e8994d22e598e4ca82a2f5d09d4 (diff) | |
parent | f4634ae8a83d13a1abf3baac8956a3111aa09ed2 (diff) | |
download | ffmpeg-946902e5b9c2574969ac239b2dfb4d88e069fa29.tar.gz |
Merge commit 'f4634ae8a83d13a1abf3baac8956a3111aa09ed2'
* commit 'f4634ae8a83d13a1abf3baac8956a3111aa09ed2':
flv: Fix the help string
Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | libavformat/flvdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index e0b79bb754..6b0d2dfc16 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -975,7 +975,7 @@ static int flv_read_seek(AVFormatContext *s, int stream_index, #define OFFSET(x) offsetof(FLVContext, x) #define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM static const AVOption options[] = { - { "flv_metadata", "Allocate streams according the onMetaData array", OFFSET(trust_metadata), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VD }, + { "flv_metadata", "Allocate streams according to the onMetaData array", OFFSET(trust_metadata), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VD }, { NULL } }; |