Ticket #5511: revert_17535_avlib_mem.diff

programs/mythtranscode/mpeg2fix.

@@ -447 +447 @@
     return (rx->WaitBuffers());
 }
 
-MPEG2replex::MPEG2replex() :
-    done(false), otype(-1), ext_count(0), mplex(NULL)
+MPEG2replex::MPEG2replex()
 {
     memset(&vrbuf, 0, sizeof(ringbuffer));
     memset(&index_vrbuf, 0, sizeof(ringbuffer));
-    memset(extrbuf, 0, sizeof(ringbuffer) * N_AUDIO);
-    memset(index_extrbuf, 0, sizeof(ringbuffer) * N_AUDIO);
-    memset(exttype, 0, sizeof(int) * N_AUDIO);
-    memset(exttypcnt, 0, sizeof(int) * N_AUDIO);
-    memset(extframe, 0, sizeof(audio_frame_t) * N_AUDIO);
-    memset(&seq_head, 0, sizeof(seq_head));
+    memset(&extrbuf, 0, sizeof(ringbuffer) * N_AUDIO);
+    memset(&index_extrbuf, 0, sizeof(ringbuffer) * N_AUDIO);
+    ext_count = 0;
 }
 
 MPEG2replex::~MPEG2replex()

programs/mythtranscode/mpeg2fix.h

@@ -42 +42 @@
 {
   public:
     MPEG2frame(int size)
-        : isSequence(false), isGop(false), framePos(NULL), gopPos(NULL)
     {
-        av_new_packet(&pkt, size);
-        pkt.priv = NULL;
-        memset(pkt.data, 0, sizeof(uint8_t) * pkt.size);
-        memset(&mpeg2_seq, 0, sizeof(mpeg2_seq));
-        memset(&mpeg2_gop, 0, sizeof(mpeg2_gop));
-        memset(&mpeg2_pic, 0, sizeof(mpeg2_pic));
+        pkt.data = (uint8_t *)malloc(size);
+        pkt_memsize = size;
     }
     ~MPEG2frame()
     {
-        av_destruct_packet(&pkt);
+        free(pkt.data);
     }
     void ensure_size(int size)
     {
-        if (pkt.size < size)
+        if (pkt_memsize < size)
         {
             pkt.data = (uint8_t *)realloc(pkt.data, size);
-            pkt.size = size;
+            pkt_memsize = size;
         }
     }
     void set_pkt(AVPacket *newpkt)
@@ -73 +68 @@
     }
 
     AVPacket pkt;
+    int pkt_memsize;
     bool isSequence;
     bool isGop;
     uint8_t *framePos;