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)
commita0dbe2a58cf5c4c635df238e1d1f680120d5a6bc
tree40205ebae5db1ba781c0903ac5807675e3e32cf1
parent6e44662b0521dff7966e38c386057ba06c346c0b
parent7040e479a1530b2eda4b89a182d5eb50a77bd907
Merge commit '7040e479a1530b2eda4b89a182d5eb50a77bd907'

* 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>
libavformat/idcin.c