[FFmpeg-cvslog] Merge commit 'e926b5ceb1962833f0c884a328382bc2eca67aff'
Michael Niedermayer
git at videolan.org
Wed May 1 18:32:29 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May 1 18:28:48 2013 +0200| [a5ba4e186bcb44c60f215e1367e3d5269b564cea] | committer: Michael Niedermayer
Merge commit 'e926b5ceb1962833f0c884a328382bc2eca67aff'
* commit 'e926b5ceb1962833f0c884a328382bc2eca67aff':
avformat: Drop unnecessary ff_ name prefixes from static functions
Conflicts:
libavformat/audiointerleave.c
libavformat/mux.c
libavformat/mxfenc.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a5ba4e186bcb44c60f215e1367e3d5269b564cea
---
More information about the ffmpeg-cvslog
mailing list