X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fswfdec.c;h=c0b2e1759bbf848ab7f110756dfa3649b68ca8f2;hb=7feb7f16a80a8d8754d2b32228f08470ecee2dca;hp=e6f659b8d0f4a0dac30a3b59836dd68144afc273;hpb=b81f8880e010ccdef3604d9beb681d3c4c6a7bc0;p=ffmpeg

diff --git a/libavformat/swfdec.c b/libavformat/swfdec.c
index e6f659b8d0f..c0b2e1759bb 100644
--- a/libavformat/swfdec.c
+++ b/libavformat/swfdec.c
@@ -106,12 +106,13 @@ static int swf_read_packet(AVFormatContext *s, AVPacket *pkt)
             avio_rl16(pb);
             avio_r8(pb);
             /* Check for FLV1 */
-            vst = av_new_stream(s, ch_id);
+            vst = avformat_new_stream(s, NULL);
             if (!vst)
                 return -1;
+            vst->id = ch_id;
             vst->codec->codec_type = AVMEDIA_TYPE_VIDEO;
             vst->codec->codec_id = ff_codec_get_id(swf_codec_tags, avio_r8(pb));
-            av_set_pts_info(vst, 16, 256, swf->frame_rate);
+            avpriv_set_pts_info(vst, 16, 256, swf->frame_rate);
             vst->codec->time_base = (AVRational){ 256, swf->frame_rate };
             len -= 8;
         } else if (tag == TAG_STREAMHEAD || tag == TAG_STREAMHEAD2) {
@@ -127,9 +128,10 @@ static int swf_read_packet(AVFormatContext *s, AVPacket *pkt)
             avio_r8(pb);
             v = avio_r8(pb);
             swf->samples_per_frame = avio_rl16(pb);
-            ast = av_new_stream(s, -1); /* -1 to avoid clash with video stream ch_id */
+            ast = avformat_new_stream(s, NULL);
             if (!ast)
                 return -1;
+            ast->id = -1; /* -1 to avoid clash with video stream ch_id */
             ast->codec->channels = 1 + (v&1);
             ast->codec->codec_type = AVMEDIA_TYPE_AUDIO;
             ast->codec->codec_id = ff_codec_get_id(swf_audio_codec_tags, (v>>4) & 15);
@@ -139,7 +141,7 @@ static int swf_read_packet(AVFormatContext *s, AVPacket *pkt)
                 ast->codec->sample_rate = 5512;
             else
                 ast->codec->sample_rate = 11025 << (sample_rate_code-1);
-            av_set_pts_info(ast, 64, 1, ast->codec->sample_rate);
+            avpriv_set_pts_info(ast, 64, 1, ast->codec->sample_rate);
             len -= 4;
         } else if (tag == TAG_VIDEOFRAME) {
             int ch_id = avio_rl16(pb);
@@ -177,12 +179,13 @@ static int swf_read_packet(AVFormatContext *s, AVPacket *pkt)
                     break;
             }
             if (i == s->nb_streams) {
-                vst = av_new_stream(s, -2); /* -2 to avoid clash with video stream and audio stream */
+                vst = avformat_new_stream(s, NULL);
                 if (!vst)
                     return -1;
+                vst->id = -2; /* -2 to avoid clash with video stream and audio stream */
                 vst->codec->codec_type = AVMEDIA_TYPE_VIDEO;
                 vst->codec->codec_id = CODEC_ID_MJPEG;
-                av_set_pts_info(vst, 64, 256, swf->frame_rate);
+                avpriv_set_pts_info(vst, 64, 256, swf->frame_rate);
                 vst->codec->time_base = (AVRational){ 256, swf->frame_rate };
                 st = vst;
             }