utvideodec: Support ULY4 and ULH4

[ffmpeg] / libavformat / rsodec.c

diff --git a/libavformat/rsodec.c b/libavformat/rsodec.c
index c3016ca332e4ccd178a3f959f582b7b87023b966..6f352af96c24988928598fbca15991c04ffae9f3 100644 (file)
--- a/libavformat/rsodec.c
+++ b/libavformat/rsodec.c
@@ -25,7 +25,6 @@
 #include "avformat.h"
 #include "internal.h"
 #include "pcm.h"
-#include "riff.h"
 #include "rso.h"
 
 static int rso_read_header(AVFormatContext *s)
@@ -44,14 +43,14 @@ static int rso_read_header(AVFormatContext *s)
     codec = ff_codec_get_id(ff_codec_rso_tags, id);
 
     if (codec == AV_CODEC_ID_ADPCM_IMA_WAV) {
-        av_log(s, AV_LOG_ERROR, "ADPCM in RSO not implemented\n");
+        avpriv_report_missing_feature(s, "ADPCM in RSO");
         return AVERROR_PATCHWELCOME;
     }
 
     bps = av_get_bits_per_sample(codec);
     if (!bps) {
-        av_log_ask_for_sample(s, "could not determine bits per sample\n");
-        return AVERROR_INVALIDDATA;
+        avpriv_request_sample(s, "Unknown bits per sample");
+        return AVERROR_PATCHWELCOME;
     }
 
     /* now we are ready: build format streams */
@@ -60,12 +59,12 @@ static int rso_read_header(AVFormatContext *s)
         return AVERROR(ENOMEM);
 
     st->duration            = (size * 8) / bps;
-    st->codec->codec_type   = AVMEDIA_TYPE_AUDIO;
-    st->codec->codec_tag    = id;
-    st->codec->codec_id     = codec;
-    st->codec->channels     = 1;
-    st->codec->channel_layout = AV_CH_LAYOUT_MONO;
-    st->codec->sample_rate  = rate;
+    st->codecpar->codec_type   = AVMEDIA_TYPE_AUDIO;
+    st->codecpar->codec_tag    = id;
+    st->codecpar->codec_id     = codec;
+    st->codecpar->channels     = 1;
+    st->codecpar->channel_layout = AV_CH_LAYOUT_MONO;
+    st->codecpar->sample_rate  = rate;
 
     avpriv_set_pts_info(st, 64, 1, rate);
 
@@ -76,7 +75,7 @@ static int rso_read_header(AVFormatContext *s)
 
 static int rso_read_packet(AVFormatContext *s, AVPacket *pkt)
 {
-    int bps = av_get_bits_per_sample(s->streams[0]->codec->codec_id);
+    int bps = av_get_bits_per_sample(s->streams[0]->codecpar->codec_id);
     int ret = av_get_packet(s->pb, pkt, BLOCK_SIZE * bps >> 3);
 
     if (ret < 0)