[FFmpeg-cvslog] Merge commit '7040e479a1530b2eda4b89a182d5eb50a77bd907'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan 10 12:45:42 2013 +0100| [a0dbe2a58cf5c4c635df238e1d1f680120d5a6bc] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a0dbe2a58cf5c4c635df238e1d1f680120d5a6bc
---