Mercurial > libavformat.hg

comparison asfdec.c @ 5913:11bb10c37225 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY. Patch by Jean-Daniel Dupas, devlists shadowlab org
author cehoyos
date Wed, 31 Mar 2010 12:29:58 +0000
parents 536e5527c1e0
children f74198942337
comparison
equal deleted inserted replaced
5912:10f577d87c71 5913:11bb10c37225
886 asf_st->pkt.dts = asf->packet_frag_timestamp; 886 asf_st->pkt.dts = asf->packet_frag_timestamp;
887 asf_st->pkt.stream_index = asf->stream_index; 887 asf_st->pkt.stream_index = asf->stream_index;
888 asf_st->pkt.pos = 888 asf_st->pkt.pos =
889 asf_st->packet_pos= asf->packet_pos; 889 asf_st->packet_pos= asf->packet_pos;
890 //printf("new packet: stream:%d key:%d packet_key:%d audio:%d size:%d\n", 890 //printf("new packet: stream:%d key:%d packet_key:%d audio:%d size:%d\n",
891 //asf->stream_index, asf->packet_key_frame, asf_st->pkt.flags & PKT_FLAG_KEY, 891 //asf->stream_index, asf->packet_key_frame, asf_st->pkt.flags & AV_PKT_FLAG_KEY,
892 //s->streams[asf->stream_index]->codec->codec_type == AVMEDIA_TYPE_AUDIO, asf->packet_obj_size); 892 //s->streams[asf->stream_index]->codec->codec_type == AVMEDIA_TYPE_AUDIO, asf->packet_obj_size);
893 if (s->streams[asf->stream_index]->codec->codec_type == AVMEDIA_TYPE_AUDIO) 893 if (s->streams[asf->stream_index]->codec->codec_type == AVMEDIA_TYPE_AUDIO)
894 asf->packet_key_frame = 1; 894 asf->packet_key_frame = 1;
895 if (asf->packet_key_frame) 895 if (asf->packet_key_frame)
896 asf_st->pkt.flags |= PKT_FLAG_KEY; 896 asf_st->pkt.flags |= AV_PKT_FLAG_KEY;
897 } 897 }
898 898
899 /* read data */ 899 /* read data */
900 //printf("READ PACKET s:%d os:%d o:%d,%d l:%d DATA:%p\n", 900 //printf("READ PACKET s:%d os:%d o:%d,%d l:%d DATA:%p\n",
901 // s->packet_size, asf_st->pkt.size, asf->packet_frag_offset, 901 // s->packet_size, asf_st->pkt.size, asf->packet_frag_offset,
1066 } 1066 }
1067 1067
1068 pts= pkt->pts; 1068 pts= pkt->pts;
1069 1069
1070 av_free_packet(pkt); 1070 av_free_packet(pkt);
1071 if(pkt->flags&PKT_FLAG_KEY){ 1071 if(pkt->flags&AV_PKT_FLAG_KEY){
1072 i= pkt->stream_index; 1072 i= pkt->stream_index;
1073 1073
1074 asf_st= s->streams[i]->priv_data; 1074 asf_st= s->streams[i]->priv_data;
1075 1075
1076 // assert((asf_st->packet_pos - s->data_offset) % s->packet_size == 0); 1076 // assert((asf_st->packet_pos - s->data_offset) % s->packet_size == 0);