Merge commit '7040e479a1530b2eda4b89a182d5eb50a77bd907'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 10 Jan 2013 11:45:42 +0000 (12:45 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 10 Jan 2013 11:45:46 +0000 (12:45 +0100)
* commit '7040e479a1530b2eda4b89a182d5eb50a77bd907':
  idcin: allow seeking back to the first packet
  idcin: set AV_PKT_FLAG_KEY for video packets with a palette

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

@@@ -291,9 -289,10 +293,10 @@@ static int idcin_read_packet(AVFormatCo
  
              pal = av_packet_new_side_data(pkt, AV_PKT_DATA_PALETTE,
                                            AVPALETTE_SIZE);
 -            if (ret < 0)
 -                return ret;
 +            if (!pal)
 +                return AVERROR(ENOMEM);
              memcpy(pal, palette, AVPALETTE_SIZE);
+             pkt->flags |= AV_PKT_FLAG_KEY;
          }
          pkt->stream_index = idcin->video_stream_index;
          pkt->duration     = 1;