RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-14 18:47:47 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit 'cea7fd9afb8488a6c48f7d7ee38602e1fd3dd425'

Browse Source 
* commit 'cea7fd9afb8488a6c48f7d7ee38602e1fd3dd425':
  mlp: Drop ff_ prefix from a static function

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-10-30 16:51:20 -03:00
commit 1242a6170e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/mlp_parser.c
View File

@ -119,7 +119,7 @@ uint64_t ff_truehd_layout(int chanmap)
return layout;
}
static int ff_mlp_get_major_sync_size(const uint8_t * buf, int bufsize)
static int mlp_get_major_sync_size(const uint8_t * buf, int bufsize)
{
int has_extension, extensions = 0;
int size = 28;
@ -149,7 +149,7 @@ int ff_mlp_read_major_sync(void *log, MLPHeaderInfo *mh, GetBitContext *gb)
av_assert1(get_bits_count(gb) == 0);
header_size = ff_mlp_get_major_sync_size(gb->buffer, gb->size_in_bits >> 3);
header_size = mlp_get_major_sync_size(gb->buffer, gb->size_in_bits >> 3);
if (header_size < 0 || gb->size_in_bits < header_size << 3) {
av_log(log, AV_LOG_ERROR, "packet too short, unable to read major sync\n");
return -1;