Merge commit '7784f47762d59e859b4d0f74b3e021ad9368ee2c'

* commit '7784f47762d59e859b4d0f74b3e021ad9368ee2c':
  lavf: stop using avpriv_flac_parse_streaminfo()

Conflicts:
	libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/Makefile
index 75c1008,6270997..0ac01c0
--- 1/libavcodec/Makefile
--- 2/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@@ -678,9 -567,7 +678,8 @@@ OBJS-$(CONFIG_VC1_VDPAU_HWACCEL
  OBJS-$(CONFIG_ADTS_MUXER)              += mpeg4audio.o
  OBJS-$(CONFIG_CAF_DEMUXER)             += mpeg4audio.o mpegaudiodata.o  \
                                            ac3tab.o
- OBJS-$(CONFIG_FLAC_DEMUXER)            += flac.o flacdata.o vorbis_data.o \
-                                           xiph.o
 -OBJS-$(CONFIG_FLAC_MUXER)              += flac.o flacdata.o
++OBJS-$(CONFIG_FLAC_DEMUXER)            += flac.o flacdata.o vorbis_data.o
 +OBJS-$(CONFIG_FLAC_MUXER)              += flac.o flacdata.o vorbis_data.o
  OBJS-$(CONFIG_FLV_DEMUXER)             += mpeg4audio.o
  OBJS-$(CONFIG_GXF_DEMUXER)             += mpeg12data.o
  OBJS-$(CONFIG_IFF_DEMUXER)             += iff.o
@@@ -698,14 -585,11 +697,14 @@@ OBJS-$(CONFIG_MOV_DEMUXER)             
  OBJS-$(CONFIG_MOV_MUXER)               += mpeg4audio.o mpegaudiodata.o
  OBJS-$(CONFIG_MPEGTS_MUXER)            += mpeg4audio.o
  OBJS-$(CONFIG_MPEGTS_DEMUXER)          += mpeg4audio.o mpegaudiodata.o
 +OBJS-$(CONFIG_MXF_MUXER)               += dnxhddata.o
  OBJS-$(CONFIG_NUT_MUXER)               += mpegaudiodata.o
- OBJS-$(CONFIG_OGG_DEMUXER)             += xiph.o flac.o flacdata.o     \
 +OBJS-$(CONFIG_OGA_MUXER)               += xiph.o flac.o flacdata.o
+ OBJS-$(CONFIG_OGG_DEMUXER)             += xiph.o       \
                                            mpeg12data.o \
 -                                          dirac.o
 -OBJS-$(CONFIG_OGG_MUXER)               += xiph.o flac.o flacdata.o
 +                                          dirac.o vorbis_data.o
 +OBJS-$(CONFIG_OGG_MUXER)               += xiph.o flac.o flacdata.o \
 +                                          vorbis_data.o
  OBJS-$(CONFIG_RTP_MUXER)               += mpeg4audio.o xiph.o
  OBJS-$(CONFIG_RTPDEC)                  += mjpeg.o
  OBJS-$(CONFIG_SPDIF_DEMUXER)           += aacadtsdec.o mpeg4audio.o

diff --cc libavformat/flacdec.c
index c291393,8abdd9d..1a8dc19
--- 1/libavformat/flacdec.c
--- 2/libavformat/flacdec.c
+++ b/libavformat/flacdec.c
@@@ -75,13 -75,17 +74,15 @@@ static int flac_read_header(AVFormatCon
          }
  
          if (metadata_type == FLAC_METADATA_TYPE_STREAMINFO) {
-             FLACStreaminfo si;
+             uint32_t samplerate;
+             uint64_t samples;
+ 
              /* STREAMINFO can only occur once */
              if (found_streaminfo) {
 -                av_freep(&buffer);
 -                return AVERROR_INVALIDDATA;
 +                RETURN_ERROR(AVERROR_INVALIDDATA);
              }
              if (metadata_size != FLAC_STREAMINFO_SIZE) {
 -                av_freep(&buffer);
 -                return AVERROR_INVALIDDATA;
 +                RETURN_ERROR(AVERROR_INVALIDDATA);
              }
              found_streaminfo = 1;
              st->codec->extradata      = buffer;

diff --cc libavformat/oggparseflac.c
index 9f0f808,57bba68..c7fb446
--- 1/libavformat/oggparseflac.c
--- 2/libavformat/oggparseflac.c
+++ b/libavformat/oggparseflac.c
@@@ -62,11 -61,16 +61,15 @@@ flac_header (AVFormatContext * s, int i
          st->codec->codec_id = AV_CODEC_ID_FLAC;
          st->need_parsing = AVSTREAM_PARSE_HEADERS;
  
 -        st->codec->extradata =
 -            av_malloc(FLAC_STREAMINFO_SIZE + FF_INPUT_BUFFER_PADDING_SIZE);
 -        memcpy(st->codec->extradata, streaminfo_start, FLAC_STREAMINFO_SIZE);
 -        st->codec->extradata_size = FLAC_STREAMINFO_SIZE;
 +        if (ff_alloc_extradata(st->codec, FLAC_STREAMINFO_SIZE) < 0)
 +            return AVERROR(ENOMEM);
 +        memcpy(st->codec->extradata, streaminfo_start, st->codec->extradata_size);
  
-         avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);
+         samplerate = AV_RB24(st->codec->extradata + 10) >> 4;
+         if (!samplerate)
+             return AVERROR_INVALIDDATA;
+ 
+         avpriv_set_pts_info(st, 64, 1, samplerate);
      } else if (mdt == FLAC_METADATA_TYPE_VORBIS_COMMENT) {
          ff_vorbis_stream_comment(s, st, os->buf + os->pstart + 4, os->psize - 4);
      }