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

[Anton Khirnov]

ffmpeg | branch: release/0.10 | Anton Khirnov <anton at khirnov.net> | Sat Nov 24 07:55:42 2012 +0100| [f65ec488a94d3828fb1550f9461e4754d47dc7b3] | committer: Reinhard Tartler

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>

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

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

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);