ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Mon Oct 30 16:51:20 2017 -0300| [1242a6170e93351b519a0b92861654d5ff14d8dc] | committer: James Almer
Merge commit 'cea7fd9afb8488a6c48f7d7ee38602e1fd3dd425' * commit 'cea7fd9afb8488a6c48f7d7ee38602e1fd3dd425': mlp: Drop ff_ prefix from a static function Merged-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1242a6170e93351b519a0b92861654d5ff14d8dc --- libavcodec/mlp_parser.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/mlp_parser.c b/libavcodec/mlp_parser.c index 23601c8633..d131106cfc 100644 --- a/libavcodec/mlp_parser.c +++ b/libavcodec/mlp_parser.c @@ -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; ====================================================================== diff --cc libavcodec/mlp_parser.c index 23601c8633,fb9ede8702..d131106cfc --- a/libavcodec/mlp_parser.c +++ b/libavcodec/mlp_parser.c @@@ -147,10 -148,10 +147,10 @@@ int ff_mlp_read_major_sync(void *log, M int ratebits, channel_arrangement, header_size; uint16_t checksum; - assert(bitstream_tell(bc) == 0); + 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(bc->buffer, bc->size_in_bits >> 3); - if (header_size < 0 || bc->size_in_bits < header_size << 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; } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
