[FFmpeg-cvslog] Merge commit '19133e96d30e3f80dbae236ef081aedef419a6bf'

Michael Niedermayer git at videolan.org
Mon Sep 29 21:44:25 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Sep 29 21:25:09 2014 +0200| [a2d5f6b9dbcc81dda68309c96e9c2a227cb37976] | committer: Michael Niedermayer

Merge commit '19133e96d30e3f80dbae236ef081aedef419a6bf'

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

Conflicts:
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list