[FFmpeg-cvslog] Merge commit 'abda15a990527557c20848f6ca2f82eb85e76dc9'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul  9 21:29:21 2014 +0200| [714d9bd6ee2fff97ed14ccf1fc02f031afccce3c] | committer: Michael Niedermayer

Merge commit 'abda15a990527557c20848f6ca2f82eb85e76dc9'

* commit 'abda15a990527557c20848f6ca2f82eb85e76dc9':
  cdg: set the keyframe flag on the first packet

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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