Merge commit '529a9893d769f381b72785c500662be2020da5fe'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Oct 2013 09:28:29 +0000 (10:28 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Oct 2013 09:28:47 +0000 (10:28 +0100)
* commit '529a9893d769f381b72785c500662be2020da5fe':
  avframe: mark source frame const in _ref and _clone

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

Simple merge
Simple merge