Loose mplayer in MPlayer/incoming/

[ffmpeg] / libavcodec / flac.c

diff --git a/libavcodec/flac.c b/libavcodec/flac.c
index c44049b35235d7274b0f06b02b80b8618c8a6693..aeb276bcdc5b6428dc9af1fc66e39f5bbc46e30b 100644 (file)
--- a/libavcodec/flac.c
+++ b/libavcodec/flac.c
@@ -236,14 +236,10 @@ void avpriv_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo *
     skip_bits_long(&gb, 64); /* md5 sum */
 }
 
+#if LIBAVCODEC_VERSION_MAJOR < 56
 void avpriv_flac_parse_block_header(const uint8_t *block_header,
                                 int *last, int *type, int *size)
 {
-    int tmp = bytestream_get_byte(&block_header);
-    if (last)
-        *last = tmp & 0x80;
-    if (type)
-        *type = tmp & 0x7F;
-    if (size)
-        *size = bytestream_get_be24(&block_header);
+    flac_parse_block_header(block_header, last, type, size);
 }
+#endif