[FFmpeg-cvslog] Merge commit '4d7ed3e73541983459a7913c2034eba69ebc113d'
Michael Niedermayer
git at videolan.org
Sun May 5 12:00:50 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May 5 11:59:20 2013 +0200| [77570facdb41233a6fef9d8861023b1eeffe361f] | committer: Michael Niedermayer
Merge commit '4d7ed3e73541983459a7913c2034eba69ebc113d'
* commit '4d7ed3e73541983459a7913c2034eba69ebc113d':
build: output-example: Add avutil to ELIBS in link command
Conflicts:
libavformat/Makefile
No change as our example build code doesnt have this bug
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=77570facdb41233a6fef9d8861023b1eeffe361f
---
More information about the ffmpeg-cvslog
mailing list