Revision 01f4895c libavformat/mpegts.c

View differences:

libavformat/mpegts.c
493 493
            }
494 494

  
495 495
            if (stream_type == STREAM_TYPE_SUBTITLE_DVB) {
496
                st->codec.sub_id = (anc_page << 16) | comp_page;
496
                st->codec->sub_id = (anc_page << 16) | comp_page;
497 497
            }
498 498
        }
499 499
    }
......
921 921
    if (st) {
922 922
        av_set_pts_info(st, 33, 1, 90000);
923 923
        st->priv_data = pes;
924
        st->codec.codec_type = codec_type;
925
        st->codec.codec_id = codec_id;
924
        st->codec->codec_type = codec_type;
925
        st->codec->codec_id = codec_id;
926 926
        st->need_parsing = 1;
927 927
        pes->st = st;
928 928
    }
......
1253 1253
        if (!st)
1254 1254
            goto fail;
1255 1255
        av_set_pts_info(st, 60, 1, 27000000);
1256
        st->codec.codec_type = CODEC_TYPE_DATA;
1257
        st->codec.codec_id = CODEC_ID_MPEG2TS;
1256
        st->codec->codec_type = CODEC_TYPE_DATA;
1257
        st->codec->codec_id = CODEC_ID_MPEG2TS;
1258 1258
        
1259 1259
        /* we iterate until we find two PCRs to estimate the bitrate */
1260 1260
        pcr_pid = -1;
......
1283 1283
        ts->pcr_incr = (pcrs[1] - pcrs[0]) / (packet_count[1] - packet_count[0]);
1284 1284
        ts->cur_pcr = pcrs[0] - ts->pcr_incr * packet_count[0];
1285 1285
        s->bit_rate = (TS_PACKET_SIZE * 8) * 27e6 / ts->pcr_incr;
1286
        st->codec.bit_rate = s->bit_rate;
1286
        st->codec->bit_rate = s->bit_rate;
1287 1287
        st->start_time = ts->cur_pcr;
1288 1288
#if 0
1289 1289
        printf("start=%0.3f pcr=%0.3f incr=%d\n",

Also available in: Unified diff