Sync with a more recent version of FFmpeg.

1 files changed, 5 insertions, 7 deletions

diff --git a/contrib/ffmpeg/libavformat/tta.c b/contrib/ffmpeg/libavformat/tta.c
index a513d9d38..a3709437e 100644
--- a/contrib/ffmpeg/libavformat/tta.c
+++ b/contrib/ffmpeg/libavformat/tta.c
@@ -40,9 +40,7 @@ static int tta_read_header(AVFormatContext *s, AVFormatParameters *ap)
 {
     TTAContext *c = s->priv_data;
     AVStream *st;
-    int i, channels, bps, samplerate, datalen, framelen, start;
-
-    start = url_ftell(&s->pb);
+    int i, channels, bps, samplerate, datalen, framelen;
 
     if (get_le32(&s->pb) != ff_get_fourcc("TTA1"))
         return -1; // not tta file
@@ -64,7 +62,7 @@ static int tta_read_header(AVFormatContext *s, AVFormatParameters *ap)
 
     url_fskip(&s->pb, 4); // header crc
 
-    framelen = 1.04489795918367346939 * samplerate;
+    framelen = samplerate*256/245;
     c->totalframes = datalen / framelen + ((datalen % framelen) ? 1 : 0);
     c->currentframe = 0;
 
@@ -77,7 +75,7 @@ static int tta_read_header(AVFormatContext *s, AVFormatParameters *ap)
         return AVERROR_NOMEM;
 
     for (i = 0; i < c->totalframes; i++)
-            c->seektable[i] = get_le32(&s->pb);
+        c->seektable[i] = get_le32(&s->pb);
     url_fskip(&s->pb, 4); // seektable crc
 
     st = av_new_stream(s, 0);
@@ -90,14 +88,14 @@ static int tta_read_header(AVFormatContext *s, AVFormatParameters *ap)
     st->codec->sample_rate = samplerate;
     st->codec->bits_per_sample = bps;
 
-    st->codec->extradata_size = url_ftell(&s->pb) - start;
+    st->codec->extradata_size = url_ftell(&s->pb);
     if(st->codec->extradata_size+FF_INPUT_BUFFER_PADDING_SIZE <= (unsigned)st->codec->extradata_size){
         //this check is redundant as get_buffer should fail
         av_log(s, AV_LOG_ERROR, "extradata_size too large\n");
         return -1;
     }
     st->codec->extradata = av_mallocz(st->codec->extradata_size+FF_INPUT_BUFFER_PADDING_SIZE);
-    url_fseek(&s->pb, start, SEEK_SET); // or SEEK_CUR and -size ? :)
+    url_fseek(&s->pb, 0, SEEK_SET);
     get_buffer(&s->pb, st->codec->extradata, st->codec->extradata_size);
 
     return 0;