[FFmpeg-cvslog] Merge commit 'a53551cba86bb67efcb6105fdc337a36c43132bd'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May 29 12:34:12 2014 +0200| [d9c4f61dab2a1994ae3220080583baab37cf2372] | committer: Michael Niedermayer

Merge commit 'a53551cba86bb67efcb6105fdc337a36c43132bd'

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

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

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