aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2012-11-24 07:55:42 +0100
committerAnton Khirnov <anton@khirnov.net>2012-11-25 16:35:20 +0100
commit4632abc7a3a64b23c243b21cae7a08e5af92231e (patch)
treeda6e4e04b19f7fa6bbecd2b3b9f1a9a45bcdab0f
parent2bf794b69820273e2284d69e9b9c98f5b7136add (diff)
downloadffmpeg-4632abc7a3a64b23c243b21cae7a08e5af92231e.tar.gz
avconv: fix copying per-stream metadata.
It is handled separately from other types because it uses stream specifiers and currently that triggers an assert in SET_DICT. CC:libav-stable@libav.org
-rw-r--r--avconv_opt.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/avconv_opt.c b/avconv_opt.c
index 03544545c9..0ea2f45d7e 100644
--- a/avconv_opt.c
+++ b/avconv_opt.c
@@ -351,6 +351,8 @@ static int copy_metadata(char *outspec, char *inspec, AVFormatContext *oc, AVFor
METADATA_CHECK_INDEX(index, context->nb_programs, "program")\
meta = &context->programs[index]->metadata;\
break;\
+ case 's':\
+ break; /* handled separately below */ \
default: av_assert0(0);\
}\