Merge commit 'a53551cba86bb67efcb6105fdc337a36c43132bd'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 May 2014 10:34:12 +0000 (12:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 29 May 2014 10:35:02 +0000 (12:35 +0200)
commitd9c4f61dab2a1994ae3220080583baab37cf2372
tree39c36c37c965e8261624f77fc77819ae7c05768e
parent78a79a2ceb63e0fff84de978f1373810ee1bc5d7
parenta53551cba86bb67efcb6105fdc337a36c43132bd
Merge commit 'a53551cba86bb67efcb6105fdc337a36c43132bd'

* commit 'a53551cba86bb67efcb6105fdc337a36c43132bd':
  frame: fix the error path in av_frame_copy_props()

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