diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 18:16:32 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-01 18:16:32 +0200 |
commit | 04fa81877913798bf4badfa472c8653219f2aeb1 (patch) | |
tree | 875c341ee83d0b4916b59a40fad7e4a58c9aeac4 /libavcodec/latm_parser.c | |
parent | cae8f469fee7c32685f04a2b507251119d6875ef (diff) | |
parent | 088f38a4f9f54bb923405c67c9e72d96d90aa284 (diff) | |
download | ffmpeg-04fa81877913798bf4badfa472c8653219f2aeb1.tar.gz |
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@gmx.at>
Diffstat (limited to 'libavcodec/latm_parser.c')
0 files changed, 0 insertions, 0 deletions