Merge commit 'abda15a990527557c20848f6ca2f82eb85e76dc9'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Jul 2014 19:29:21 +0000 (21:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Jul 2014 19:30:45 +0000 (21:30 +0200)
commit714d9bd6ee2fff97ed14ccf1fc02f031afccce3c
tree7cbb3b97509253e64d4a5b7a1a7bcff74a36c4fc
parent76a35f7830d1bd05ce9cdd63a48d5beb9f79ef7c
parentabda15a990527557c20848f6ca2f82eb85e76dc9
Merge commit 'abda15a990527557c20848f6ca2f82eb85e76dc9'

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

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