Ticket #5511: revert_17535_avlib_mem.diff
File revert_17535_avlib_mem.diff, 2.0 KB (added by , 13 years ago) |
---|
-
programs/mythtranscode/mpeg2fix.
old new 447 447 return (rx->WaitBuffers()); 448 448 } 449 449 450 MPEG2replex::MPEG2replex() : 451 done(false), otype(-1), ext_count(0), mplex(NULL) 450 MPEG2replex::MPEG2replex() 452 451 { 453 452 memset(&vrbuf, 0, sizeof(ringbuffer)); 454 453 memset(&index_vrbuf, 0, sizeof(ringbuffer)); 455 memset(extrbuf, 0, sizeof(ringbuffer) * N_AUDIO); 456 memset(index_extrbuf, 0, sizeof(ringbuffer) * N_AUDIO); 457 memset(exttype, 0, sizeof(int) * N_AUDIO); 458 memset(exttypcnt, 0, sizeof(int) * N_AUDIO); 459 memset(extframe, 0, sizeof(audio_frame_t) * N_AUDIO); 460 memset(&seq_head, 0, sizeof(seq_head)); 454 memset(&extrbuf, 0, sizeof(ringbuffer) * N_AUDIO); 455 memset(&index_extrbuf, 0, sizeof(ringbuffer) * N_AUDIO); 456 ext_count = 0; 461 457 } 462 458 463 459 MPEG2replex::~MPEG2replex() -
programs/mythtranscode/mpeg2fix.h
old new 42 42 { 43 43 public: 44 44 MPEG2frame(int size) 45 : isSequence(false), isGop(false), framePos(NULL), gopPos(NULL)46 45 { 47 av_new_packet(&pkt, size); 48 pkt.priv = NULL; 49 memset(pkt.data, 0, sizeof(uint8_t) * pkt.size); 50 memset(&mpeg2_seq, 0, sizeof(mpeg2_seq)); 51 memset(&mpeg2_gop, 0, sizeof(mpeg2_gop)); 52 memset(&mpeg2_pic, 0, sizeof(mpeg2_pic)); 46 pkt.data = (uint8_t *)malloc(size); 47 pkt_memsize = size; 53 48 } 54 49 ~MPEG2frame() 55 50 { 56 av_destruct_packet(&pkt);51 free(pkt.data); 57 52 } 58 53 void ensure_size(int size) 59 54 { 60 if (pkt .size < size)55 if (pkt_memsize < size) 61 56 { 62 57 pkt.data = (uint8_t *)realloc(pkt.data, size); 63 pkt .size = size;58 pkt_memsize = size; 64 59 } 65 60 } 66 61 void set_pkt(AVPacket *newpkt) … … 73 68 } 74 69 75 70 AVPacket pkt; 71 int pkt_memsize; 76 72 bool isSequence; 77 73 bool isGop; 78 74 uint8_t *framePos;