[FFmpeg-cvslog] Merge commit '088f38a4f9f54bb923405c67c9e72d96d90aa284'
Michael Niedermayer
git at videolan.org
Wed May 1 18:21:16 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May 1 18:16:32 2013 +0200| [04fa81877913798bf4badfa472c8653219f2aeb1] | committer: Michael Niedermayer
Merge commit '088f38a4f9f54bb923405c67c9e72d96d90aa284'
* commit '088f38a4f9f54bb923405c67c9e72d96d90aa284':
avcodec: Drop unnecessary ff_ name prefixes from static functions
Conflicts:
libavcodec/ass.c
libavcodec/h264_parser.c
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=04fa81877913798bf4badfa472c8653219f2aeb1
---
More information about the ffmpeg-cvslog
mailing list