Merge remote-tracking branch 'qatar/master'

* qatar/master: (21 commits)
  fate: allow testing with libavfilter disabled
  x86: XOP/FMA4 CPU detection support
  ws_snd: misc cosmetic clean-ups
  ws_snd: remove the 2-bit ADPCM table and just subtract 2 instead.
  ws_snd: use memcpy() and memset() instead of loops
  ws_snd: use samples pointer for loop termination instead of a separate iterator variable.
  ws_snd: make sure number of channels is 1
  ws_snd: add some checks to prevent buffer overread or overwrite.
  ws_snd: decode to AV_SAMPLE_FMT_U8 instead of S16.
  flacdec: fix buffer size checking in get_metadata_size()
  rtp: Simplify ff_rtp_get_payload_type
  rtpenc: Add a payload type private option
  rtp: Correct ff_rtp_get_payload_type documentation
  avconv: replace all fprintf() by av_log().
  avconv: change av_log verbosity from ERROR to FATAL for fatal errors.
  cmdutils: replace fprintf() by av_log()
  avtools: parse loglevel before all the other options.
  oggdec: add support for Xiph's CELT codec
  sol: return error if av_get_packet() fails.
  cosmetics: reindent and pretty-print
  ...

Conflicts:
	avconv.c
	cmdutils.c
	libavcodec/avcodec.h
	libavcodec/version.h
	libavformat/oggparsecelt.c
	libavformat/utils.c
	libavutil/avutil.h

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

1 files changed, 12 insertions, 14 deletions

diff --git a/libavformat/oggparsecelt.c b/libavformat/oggparsecelt.c
index 2adc06046a..90fae7d777 100644
--- a/libavformat/oggparsecelt.c
+++ b/libavformat/oggparsecelt.c
@@ -20,9 +20,10 @@
  */
 
 #include <string.h>
+
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 #include "oggdec.h"
-#include "libavutil/intreadwrite.h"
 
 struct oggcelt_private {
     int extra_headers_left;
@@ -38,11 +39,10 @@ static int celt_header(AVFormatContext *s, int idx)
 
     if (os->psize == 60 &&
         !memcmp(p, ff_celt_codec.magic, ff_celt_codec.magicsize)) {
-
         /* Main header */
 
-        uint32_t version, header_size av_unused, sample_rate, nb_channels, frame_size;
-        uint32_t overlap, bytes_per_packet av_unused, extra_headers;
+        uint32_t version, sample_rate, nb_channels, frame_size;
+        uint32_t overlap, extra_headers;
         uint8_t *extradata;
 
         extradata = av_malloc(2 * sizeof(uint32_t) +
@@ -54,12 +54,12 @@ static int celt_header(AVFormatContext *s, int idx)
             return AVERROR(ENOMEM);
         }
         version          = AV_RL32(p + 28);
-        header_size      = AV_RL32(p + 32); /* unused */
+        /* unused header size field skipped */
         sample_rate      = AV_RL32(p + 36);
         nb_channels      = AV_RL32(p + 40);
         frame_size       = AV_RL32(p + 44);
         overlap          = AV_RL32(p + 48);
-        bytes_per_packet = AV_RL32(p + 52); /* unused */
+        /* unused bytes per packet field skipped */
         extra_headers    = AV_RL32(p + 56);
         st->codec->codec_type     = AVMEDIA_TYPE_AUDIO;
         st->codec->codec_id       = CODEC_ID_CELT;
@@ -67,25 +67,23 @@ static int celt_header(AVFormatContext *s, int idx)
         st->codec->channels       = nb_channels;
         st->codec->frame_size     = frame_size;
         st->codec->sample_fmt     = AV_SAMPLE_FMT_S16;
-        av_set_pts_info(st, 64, 1, sample_rate);
+        av_free(st->codec->extradata);
+        st->codec->extradata      = extradata;
+        st->codec->extradata_size = 2 * sizeof(uint32_t);
+        if (sample_rate)
+            av_set_pts_info(st, 64, 1, sample_rate);
         priv->extra_headers_left  = 1 + extra_headers;
         av_free(os->private);
         os->private = priv;
         AV_WL32(extradata + 0, overlap);
         AV_WL32(extradata + 4, version);
-        av_free(st->codec->extradata);
-        st->codec->extradata = extradata;
-        st->codec->extradata_size = 2 * sizeof(uint32_t);
         return 1;
-
-    } else if(priv && priv->extra_headers_left) {
-
+    } else if (priv && priv->extra_headers_left) {
         /* Extra headers (vorbiscomment) */
 
         ff_vorbis_comment(s, &st->metadata, p, os->psize);
         priv->extra_headers_left--;
         return 1;
-
     } else {
         return 0;
     }