Update internal FFmpeg copy.

1 files changed, 22 insertions, 24 deletions

diff --git a/contrib/ffmpeg/libavformat/mpc.c b/contrib/ffmpeg/libavformat/mpc.c
index a28efb16d..8e6c573df 100644
--- a/contrib/ffmpeg/libavformat/mpc.c
+++ b/contrib/ffmpeg/libavformat/mpc.c
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include "avformat.h"
 #include "bitstream.h"
@@ -42,8 +42,6 @@ typedef struct {
 static int mpc_probe(AVProbeData *p)
 {
     const uint8_t *d = p->buf;
-    if (p->buf_size < 32)
-        return 0;
     if (d[0] == 'M' && d[1] == 'P' && d[2] == '+' && (d[3] == 0x17 || d[3] == 0x7))
         return AVPROBE_SCORE_MAX;
     if (d[0] == 'I' && d[1] == 'D' && d[2] == '3')
@@ -57,31 +55,31 @@ static int mpc_read_header(AVFormatContext *s, AVFormatParameters *ap)
     AVStream *st;
     int t;
 
-    t = get_le24(&s->pb);
+    t = get_le24(s->pb);
     if(t != MKTAG('M', 'P', '+', 0)){
         if(t != MKTAG('I', 'D', '3', 0)){
             av_log(s, AV_LOG_ERROR, "Not a Musepack file\n");
             return -1;
         }
         /* skip ID3 tags and try again */
-        url_fskip(&s->pb, 3);
-        t  = get_byte(&s->pb) << 21;
-        t |= get_byte(&s->pb) << 14;
-        t |= get_byte(&s->pb) <<  7;
-        t |= get_byte(&s->pb);
+        url_fskip(s->pb, 3);
+        t  = get_byte(s->pb) << 21;
+        t |= get_byte(s->pb) << 14;
+        t |= get_byte(s->pb) <<  7;
+        t |= get_byte(s->pb);
         av_log(s, AV_LOG_DEBUG, "Skipping %d(%X) bytes of ID3 data\n", t, t);
-        url_fskip(&s->pb, t);
-        if(get_le24(&s->pb) != MKTAG('M', 'P', '+', 0)){
+        url_fskip(s->pb, t);
+        if(get_le24(s->pb) != MKTAG('M', 'P', '+', 0)){
             av_log(s, AV_LOG_ERROR, "Not a Musepack file\n");
             return -1;
         }
     }
-    c->ver = get_byte(&s->pb);
+    c->ver = get_byte(s->pb);
     if(c->ver != 0x07 && c->ver != 0x17){
         av_log(s, AV_LOG_ERROR, "Can demux Musepack SV7, got version %02X\n", c->ver);
         return -1;
     }
-    c->fcount = get_le32(&s->pb);
+    c->fcount = get_le32(s->pb);
     if((int64_t)c->fcount * sizeof(MPCFrame) >= UINT_MAX){
         av_log(s, AV_LOG_ERROR, "Too many frames, seeking is not possible\n");
         return -1;
@@ -94,7 +92,7 @@ static int mpc_read_header(AVFormatContext *s, AVFormatParameters *ap)
 
     st = av_new_stream(s, 0);
     if (!st)
-        return AVERROR_NOMEM;
+        return AVERROR(ENOMEM);
     st->codec->codec_type = CODEC_TYPE_AUDIO;
     st->codec->codec_id = CODEC_ID_MUSEPACK7;
     st->codec->channels = 2;
@@ -102,7 +100,7 @@ static int mpc_read_header(AVFormatContext *s, AVFormatParameters *ap)
 
     st->codec->extradata_size = 16;
     st->codec->extradata = av_mallocz(st->codec->extradata_size+FF_INPUT_BUFFER_PADDING_SIZE);
-    get_buffer(&s->pb, st->codec->extradata, 16);
+    get_buffer(s->pb, st->codec->extradata, 16);
     st->codec->sample_rate = mpc_rate[st->codec->extradata[2] & 3];
     av_set_pts_info(st, 32, MPC_FRAMESIZE, st->codec->sample_rate);
     /* scan for seekpoints */
@@ -122,22 +120,22 @@ static int mpc_read_packet(AVFormatContext *s, AVPacket *pkt)
         return -1;
 
     if(c->curframe != c->lastframe + 1){
-        url_fseek(&s->pb, c->frames[c->curframe].pos, SEEK_SET);
+        url_fseek(s->pb, c->frames[c->curframe].pos, SEEK_SET);
         c->curbits = c->frames[c->curframe].skip;
     }
     c->lastframe = c->curframe;
     c->curframe++;
     curbits = c->curbits;
-    pos = url_ftell(&s->pb);
-    tmp = get_le32(&s->pb);
+    pos = url_ftell(s->pb);
+    tmp = get_le32(s->pb);
     if(curbits <= 12){
         size2 = (tmp >> (12 - curbits)) & 0xFFFFF;
     }else{
-        tmp = (tmp << 32) | get_le32(&s->pb);
+        tmp = (tmp << 32) | get_le32(s->pb);
         size2 = (tmp >> (44 - curbits)) & 0xFFFFF;
     }
     curbits += 20;
-    url_fseek(&s->pb, pos, SEEK_SET);
+    url_fseek(s->pb, pos, SEEK_SET);
 
     size = ((size2 + curbits + 31) & ~31) >> 3;
     if(cur == c->frames_noted){
@@ -150,19 +148,19 @@ static int mpc_read_packet(AVFormatContext *s, AVPacket *pkt)
     c->curbits = (curbits + size2) & 0x1F;
 
     if (av_new_packet(pkt, size) < 0)
-        return AVERROR_IO;
+        return AVERROR(EIO);
 
     pkt->data[0] = curbits;
     pkt->data[1] = (c->curframe > c->fcount);
 
     pkt->stream_index = 0;
     pkt->pts = cur;
-    ret = get_buffer(&s->pb, pkt->data + 4, size);
+    ret = get_buffer(s->pb, pkt->data + 4, size);
     if(c->curbits)
-        url_fseek(&s->pb, -4, SEEK_CUR);
+        url_fseek(s->pb, -4, SEEK_CUR);
     if(ret < size){
         av_free_packet(pkt);
-        return AVERROR_IO;
+        return AVERROR(EIO);
     }
     pkt->size = ret + 4;