asf: split ASFContext into muxer and demuxer parts.

[ffmpeg] / libavformat / tmv.c

diff --git a/libavformat/tmv.c b/libavformat/tmv.c
index fe38113cebefc0a658132112b83767062717bb51..72d0f29483832b4eb53b5bceaf042e26f2978ac3 100644 (file)
--- a/libavformat/tmv.c
+++ b/libavformat/tmv.c
@@ -21,7 +21,7 @@
 
 /**
  * 8088flex TMV file demuxer
- * @file libavformat/tmv.c
+ * @file
  * @author Daniel Verkamp
  * @sa http://www.oldskool.org/pc/8088_Corruption
  */
@@ -109,9 +109,8 @@ static int tmv_read_header(AVFormatContext *s, AVFormatParameters *ap)
         return -1;
     }
 
-    ast->codec->codec_type            = CODEC_TYPE_AUDIO;
+    ast->codec->codec_type            = AVMEDIA_TYPE_AUDIO;
     ast->codec->codec_id              = CODEC_ID_PCM_U8;
-    ast->codec->sample_fmt            = SAMPLE_FMT_U8;
     ast->codec->channels              = features & TMV_STEREO ? 2 : 1;
     ast->codec->bits_per_coded_sample = 8;
     ast->codec->bit_rate              = ast->codec->sample_rate *
@@ -122,7 +121,7 @@ static int tmv_read_header(AVFormatContext *s, AVFormatParameters *ap)
     fps.den = tmv->audio_chunk_size;
     av_reduce(&fps.num, &fps.den, fps.num, fps.den, 0xFFFFFFFFLL);
 
-    vst->codec->codec_type = CODEC_TYPE_VIDEO;
+    vst->codec->codec_type = AVMEDIA_TYPE_VIDEO;
     vst->codec->codec_id   = CODEC_ID_TMV;
     vst->codec->pix_fmt    = PIX_FMT_PAL8;
     vst->codec->width      = char_cols * 8;
@@ -157,7 +156,7 @@ static int tmv_read_packet(AVFormatContext *s, AVPacket *pkt)
 
     pkt->stream_index  = tmv->stream_index;
     tmv->stream_index ^= 1;
-    pkt->flags        |= PKT_FLAG_KEY;
+    pkt->flags        |= AV_PKT_FLAG_KEY;
 
     return ret;
 }
@@ -179,7 +178,7 @@ static int tmv_read_seek(AVFormatContext *s, int stream_index,
     return 0;
 }
 
-AVInputFormat tmv_demuxer = {
+AVInputFormat ff_tmv_demuxer = {
     "tmv",
     NULL_IF_CONFIG_SMALL("8088flex TMV"),
     sizeof(TMVContext),