avformat/utils: move side data merge after parser
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 20 Nov 2013 23:09:29 +0000 (00:09 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 21 Nov 2013 00:02:11 +0000 (01:02 +0100)
commit98fc81b20d6350ba8bb2b3ae936a29bda37d1610
tree024de29192a92e0fbd84a53c72fc7e661f32c523
parente50278348a3144f7de217cede54fc24399a733f8
avformat/utils: move side data merge after parser

merging before the parser can conflict with the parser, also
future changes depend on it being done later

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/utils.c