We're using generic tag-to-ID functions, so specific codec_id assignments

[ffmpeg] / libavformat / pva.c

diff --git a/libavformat/pva.c b/libavformat/pva.c
index 03b92bf3d66f58fa3800865dd093edbb08da03ac..abbc6f1c60cfa92b8cf6e72b1c52ee0bdfecb6e8 100644 (file)
--- a/libavformat/pva.c
+++ b/libavformat/pva.c
@@ -45,7 +45,7 @@ static int pva_read_header(AVFormatContext *s, AVFormatParameters *ap) {
 
     if (!(st = av_new_stream(s, 0)))
         return AVERROR(ENOMEM);
-    st->codec->codec_type = CODEC_TYPE_VIDEO;
+    st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
     st->codec->codec_id   = CODEC_ID_MPEG2VIDEO;
     st->need_parsing      = AVSTREAM_PARSE_FULL;
     av_set_pts_info(st, 32, 1, 90000);
@@ -53,9 +53,9 @@ static int pva_read_header(AVFormatContext *s, AVFormatParameters *ap) {
 
     if (!(st = av_new_stream(s, 1)))
         return AVERROR(ENOMEM);
-    st->codec->codec_type = CODEC_TYPE_AUDIO;
+    st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
     st->codec->codec_id   = CODEC_ID_MP2;
-    st->need_parsing      = AVSTREAM_PARSE_HEADERS;
+    st->need_parsing      = AVSTREAM_PARSE_FULL;
     av_set_pts_info(st, 33, 1, 90000);
     av_add_index_entry(st, 0, 0, 0, 0, AVINDEX_KEYFRAME);
 
@@ -176,7 +176,7 @@ static int64_t pva_read_timestamp(struct AVFormatContext *s, int stream_index,
     ByteIOContext *pb = s->pb;
     PVAContext *pvactx = s->priv_data;
     int length, streamid;
-    int64_t res;
+    int64_t res = AV_NOPTS_VALUE;
 
     pos_limit = FFMIN(*pos+PVA_MAX_PAYLOAD_LENGTH*8, (uint64_t)*pos+pos_limit);
 
@@ -202,7 +202,7 @@ static int64_t pva_read_timestamp(struct AVFormatContext *s, int stream_index,
 
 AVInputFormat pva_demuxer = {
     "pva",
-    "pva file and stream format",
+    NULL_IF_CONFIG_SMALL("TechnoTrend PVA file and stream format"),
     sizeof(PVAContext),
     pva_probe,
     pva_read_header,