# HG changeset patch # User jbr # Date 1194134793 0 # Node ID cd4b72a32517d16d653cc08b10c9b8732d163fb8 # Parent 83554c0e9ce6ae5b26856b496eff776151fd1372 Add decoding support for variable block size FLAC files using the latest FLAC specification. Patch by Josh Coalson. diff -r 83554c0e9ce6 -r cd4b72a32517 flac.c --- a/flac.c Sat Nov 03 23:54:50 2007 +0000 +++ b/flac.c Sun Nov 04 00:06:33 2007 +0000 @@ -628,9 +628,9 @@ if (!metadata_parse(s)) { 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"); - 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); goto end; // we may not have enough bits left to decode a frame, so try next time }