Merge remote-tracking branch 'qatar/master'

* qatar/master:
  idcin: fix memleaks in idcin_read_packet()

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

libavformat/idcin.c

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