Merge commit '5fdaf312c5541b77b6364db8b49d6abb416a25c0'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 28 May 2014 10:33:07 +0000 (12:33 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 28 May 2014 10:33:49 +0000 (12:33 +0200)
* commit '5fdaf312c5541b77b6364db8b49d6abb416a25c0':
  flac: make avpriv_flac_parse_block_header() inline

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/flac.c
libavcodec/flac.h
libavcodec/flacdec.c
libavformat/flacdec.c

Simple merge
Simple merge
Simple merge
@@@ -49,9 -49,9 +49,9 @@@ static int flac_read_header(AVFormatCon
      }
  
      /* process metadata blocks */
 -    while (!s->pb->eof_reached && !metadata_last) {
 +    while (!url_feof(s->pb) && !metadata_last) {
          avio_read(s->pb, header, 4);
-         avpriv_flac_parse_block_header(header, &metadata_last, &metadata_type,
+         flac_parse_block_header(header, &metadata_last, &metadata_type,
                                     &metadata_size);
          switch (metadata_type) {
          /* allocate and read metadata block for supported types */