Merge commit 'c342132fa8a29692e28c98238e3a31da5c407e42'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Dec 2013 16:59:33 +0000 (17:59 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Dec 2013 16:59:33 +0000 (17:59 +0100)
commit3f5f955c5366de1f0dc643d9631b6cc19ba008cd
treeba91ef90132b79390963a0df249ce45da9f02d56
parentf3acdd44bf37557574dea2c2c6d9771642e9ebbc
parentc342132fa8a29692e28c98238e3a31da5c407e42
Merge commit 'c342132fa8a29692e28c98238e3a31da5c407e42'

* commit 'c342132fa8a29692e28c98238e3a31da5c407e42':
  frame: copy flags in av_frame_copy_props()

Conflicts:
libavutil/frame.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/frame.c