virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Add decoding support for variable block size FLAC files using the latest FLAC

Browse Source 
specification. Patch by Josh Coalson.

Originally committed as revision 10916 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Josh Coalson 2007-11-04 00:06:33 +00:00 committed by Justin Ruggles
parent e471443ab5
commit 0cb2774a4a
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/flac.c
View File

@ -628,9 +628,9 @@ static int flac_decode_frame(AVCodecContext *avctx,
if (!metadata_parse(s)) if (!metadata_parse(s))
{ {
tmp = show_bits(&s->gb, 16); tmp = show_bits(&s->gb, 16);
if(tmp != 0xFFF8){ if((tmp & 0xFFFE) != 0xFFF8){
av_log(s->avctx, AV_LOG_ERROR, "FRAME HEADER not here\n"); av_log(s->avctx, AV_LOG_ERROR, "FRAME HEADER not here\n");
while(get_bits_count(&s->gb)/8+2 < buf_size && show_bits(&s->gb, 16) != 0xFFF8) while(get_bits_count(&s->gb)/8+2 < buf_size && (show_bits(&s->gb, 16) & 0xFFFE) != 0xFFF8)
skip_bits(&s->gb, 8); skip_bits(&s->gb, 8);
goto end; // we may not have enough bits left to decode a frame, so try next time goto end; // we may not have enough bits left to decode a frame, so try next time
} }