Merge commit '943135621830ac3857d3cf766cfc280a95bb3c13'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Dec 2013 22:24:42 +0000 (23:24 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Dec 2013 22:24:48 +0000 (23:24 +0100)
commit409a143e4b49b9d1176aaf6c76da536ffd90152b
treeb86750605571984a18ceff6eff36113f728c45df
parent4cbf3eb9e6a88426da255a00305b5858070d192a
parent943135621830ac3857d3cf766cfc280a95bb3c13
Merge commit '943135621830ac3857d3cf766cfc280a95bb3c13'

* commit '943135621830ac3857d3cf766cfc280a95bb3c13':
  lavc: deprecate avcodec_free_frame()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/avcodec.h
libavcodec/utils.c