[libav-commits] avconv: fix copying per-stream metadata.

Anton Khirnov git at libav.org
Sat Jan 5 13:14:27 CET 2013


Module: libav
Branch: release/0.8
Commit: f65ec488a94d3828fb1550f9461e4754d47dc7b3

Author:    Anton Khirnov <anton at khirnov.net>
Committer: Reinhard Tartler <siretart at tauware.de>
Date:      Sat Nov 24 07:55:42 2012 +0100

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.

(cherry picked from commit 4632abc7a3a64b23c243b21cae7a08e5af92231e)

Conflicts:

	avconv_opt.c

Signed-off-by: Reinhard Tartler <siretart at tauware.de>

---

 avconv.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/avconv.c b/avconv.c
index de228ec..df86b2b 100644
--- a/avconv.c
+++ b/avconv.c
@@ -3101,6 +3101,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 */ \
         }\
 
     SET_DICT(type_in, meta_in, ic, idx_in);



More information about the libav-commits mailing list