Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 17 Jan 2013 12:44:37 +0000 (13:44 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 17 Jan 2013 12:44:37 +0000 (13:44 +0100)
* qatar/master:
  idcin: fix memleaks in idcin_read_packet()

Conflicts:
libavformat/idcin.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/idcin.c

@@@ -321,8 -317,10 +321,10 @@@ static int idcin_read_packet(AVFormatCo
  
              pal = av_packet_new_side_data(pkt, AV_PKT_DATA_PALETTE,
                                            AVPALETTE_SIZE);
-             if (!pal)
 -            if (ret < 0) {
++            if (!pal) {
+                 av_free_packet(pkt);
 -                return ret;
 +                return AVERROR(ENOMEM);
+             }
              memcpy(pal, palette, AVPALETTE_SIZE);
              pkt->flags |= AV_PKT_FLAG_KEY;
          }