[FFmpeg-cvslog] Merge commit '601d6228c4811d8971a2412a759e1a4ab775ebe8'
Michael Niedermayer
git at videolan.org
Sun Oct 13 09:46:35 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Oct 13 09:34:51 2013 +0200| [92b03cf926efae224762dcc74d035cbf67b45368] | committer: Michael Niedermayer
Merge commit '601d6228c4811d8971a2412a759e1a4ab775ebe8'
* commit '601d6228c4811d8971a2412a759e1a4ab775ebe8':
flac: move picture parsing code in a separate file
Conflicts:
libavformat/Makefile
libavformat/flacdec.c
See: 1e5bbbfcf303ec3db0c7db30b85855e2e5358aec
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=92b03cf926efae224762dcc74d035cbf67b45368
---
More information about the ffmpeg-cvslog
mailing list