Merge commit '19133e96d30e3f80dbae236ef081aedef419a6bf'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 29 Sep 2014 19:25:09 +0000 (21:25 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 29 Sep 2014 19:25:09 +0000 (21:25 +0200)
commita2d5f6b9dbcc81dda68309c96e9c2a227cb37976
treeaa916a00e8e20877451001ac4e20c4268ac4ebbd
parent56c47364c3b50c66c54b3372650f7fd542d998bb
parent19133e96d30e3f80dbae236ef081aedef419a6bf
Merge commit '19133e96d30e3f80dbae236ef081aedef419a6bf'

* commit '19133e96d30e3f80dbae236ef081aedef419a6bf':
  lavf: fix memleaks in avformat_find_stream_info()

Conflicts:
libavformat/utils.c

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