Remove disabled legacy code in ffplay.

[ffmpeg] / libavformat / mtv.c

diff --git a/libavformat/mtv.c b/libavformat/mtv.c
index 0547430f7419324a44a1809efa6ad5b4d48922e6..acb21a99b8894d99286c5f13d4f0bd8d3650d8de 100644 (file)
--- a/libavformat/mtv.c
+++ b/libavformat/mtv.c
@@ -20,7 +20,7 @@
  */
 
 /**
- * @file libavformat/mtv.c
+ * @file
  * MTV demuxer.
  */
 
@@ -40,7 +40,7 @@ typedef struct MTVDemuxContext {
     unsigned int file_size;         ///< filesize, not always right
     unsigned int segments;          ///< number of 512 byte segments
     unsigned int audio_identifier;  ///< 'MP3' on all files I have seen
-    unsigned int audio_br;          ///< bitrate of audio chanel (mp3)
+    unsigned int audio_br;          ///< bitrate of audio channel (mp3)
     unsigned int img_colorfmt;      ///< frame colorfmt rgb 565/555
     unsigned int img_bpp;           ///< frame bits per pixel
     unsigned int img_width;         //
@@ -62,7 +62,7 @@ static int mtv_probe(AVProbeData *p)
         return 0;
 
     /* If width or height are 0 then imagesize header field should not */
-    if(AV_RL16(&p->buf[52]) && AV_RL16(&p->buf[54]))
+    if(!AV_RL16(&p->buf[52]) || !AV_RL16(&p->buf[54]))
     {
         if(!!AV_RL16(&p->buf[56]))
             return AVPROBE_SCORE_MAX/2;
@@ -70,6 +70,9 @@ static int mtv_probe(AVProbeData *p)
             return 0;
     }
 
+    if(p->buf[51] != 16)
+        return AVPROBE_SCORE_MAX/4; // But we are going to assume 16bpp anyway ..
+
     return AVPROBE_SCORE_MAX;
 }
 
@@ -120,12 +123,11 @@ static int mtv_read_header(AVFormatContext *s, AVFormatParameters *ap)
         return AVERROR(ENOMEM);
 
     av_set_pts_info(st, 64, 1, mtv->video_fps);
-    st->codec->codec_type      = CODEC_TYPE_VIDEO;
+    st->codec->codec_type      = AVMEDIA_TYPE_VIDEO;
     st->codec->codec_id        = CODEC_ID_RAWVIDEO;
-    st->codec->codec_tag       = MKTAG('R', 'G', 'B', mtv->img_bpp);
+    st->codec->pix_fmt         = PIX_FMT_RGB565;
     st->codec->width           = mtv->img_width;
     st->codec->height          = mtv->img_height;
-    st->codec->bits_per_coded_sample = mtv->img_bpp;
     st->codec->sample_rate     = mtv->video_fps;
     st->codec->extradata       = av_strdup("BottomUp");
     st->codec->extradata_size  = 9;
@@ -137,7 +139,7 @@ static int mtv_read_header(AVFormatContext *s, AVFormatParameters *ap)
         return AVERROR(ENOMEM);
 
     av_set_pts_info(st, 64, 1, AUDIO_SAMPLING_RATE);
-    st->codec->codec_type      = CODEC_TYPE_AUDIO;
+    st->codec->codec_type      = AVMEDIA_TYPE_AUDIO;
     st->codec->codec_id        = CODEC_ID_MP3;
     st->codec->bit_rate        = mtv->audio_br;
     st->need_parsing           = AVSTREAM_PARSE_FULL;
@@ -165,8 +167,8 @@ static int mtv_read_packet(AVFormatContext *s, AVPacket *pkt)
         url_fskip(pb, MTV_AUDIO_PADDING_SIZE);
 
         ret = av_get_packet(pb, pkt, MTV_ASUBCHUNK_DATA_SIZE);
-        if(ret != MTV_ASUBCHUNK_DATA_SIZE)
-            return AVERROR(EIO);
+        if(ret < 0)
+            return ret;
 
         pkt->pos -= MTV_AUDIO_PADDING_SIZE;
         pkt->stream_index = AUDIO_SID;
@@ -174,8 +176,8 @@ static int mtv_read_packet(AVFormatContext *s, AVPacket *pkt)
     }else
     {
         ret = av_get_packet(pb, pkt, mtv->img_segment_size);
-        if(ret != mtv->img_segment_size)
-            return AVERROR(EIO);
+        if(ret < 0)
+            return ret;
 
 #if !HAVE_BIGENDIAN
 
@@ -186,7 +188,7 @@ static int mtv_read_packet(AVFormatContext *s, AVPacket *pkt)
          */
 
         for(i=0;i<mtv->img_segment_size/2;i++)
-            *((uint16_t *)pkt->data+i) = bswap_16(*((uint16_t *)pkt->data+i));
+            *((uint16_t *)pkt->data+i) = av_bswap16(*((uint16_t *)pkt->data+i));
 #endif
         pkt->stream_index = VIDEO_SID;
     }
@@ -194,7 +196,7 @@ static int mtv_read_packet(AVFormatContext *s, AVPacket *pkt)
     return ret;
 }
 
-AVInputFormat mtv_demuxer = {
+AVInputFormat ff_mtv_demuxer = {
     "MTV",
     NULL_IF_CONFIG_SMALL("MTV format"),
     sizeof(MTVDemuxContext),