Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / rsodec.c

diff --git a/libavformat/rsodec.c b/libavformat/rsodec.c
index 14adc04b4beabbb2e6682bda32bec1180a1d8eea..dade0239da7ff115e446ef251e2dbcec99809177 100644 (file)
--- a/libavformat/rsodec.c
+++ b/libavformat/rsodec.c
@@ -65,7 +65,7 @@ static int rso_read_header(AVFormatContext *s, AVFormatParameters *ap)
     st->codec->channels     = 1;
     st->codec->sample_rate  = rate;
 
-    av_set_pts_info(st, 64, 1, rate);
+    avpriv_set_pts_info(st, 64, 1, rate);
 
     return 0;
 }
@@ -92,11 +92,8 @@ AVInputFormat ff_rso_demuxer = {
     .name           =   "rso",
     .long_name      =   NULL_IF_CONFIG_SMALL("Lego Mindstorms RSO format"),
     .extensions     =   "rso",
-    .priv_data_size =   0,
-    .read_probe     =   NULL, /* no magic value in this format */
     .read_header    =   rso_read_header,
     .read_packet    =   rso_read_packet,
-    .read_close     =   NULL,
     .read_seek      =   pcm_read_seek,
     .codec_tag      =   (const AVCodecTag* const []){ff_codec_rso_tags, 0},
 };