[FFmpeg-cvslog] avconv: fix copying per-stream metadata.

Anton Khirnov git at videolan.org
Mon Nov 26 00:50:57 CET 2012


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sat Nov 24 07:55:42 2012 +0100| [4632abc7a3a64b23c243b21cae7a08e5af92231e] | committer: Anton Khirnov

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 at libav.org

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4632abc7a3a64b23c243b21cae7a08e5af92231e
---

 avconv_opt.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/avconv_opt.c b/avconv_opt.c
index 0354454..0ea2f45 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);\
         }\
 



More information about the ffmpeg-cvslog mailing list