Merge commit '0232ba62a28527579e34d44700b48017cc727e5f'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Feb 2015 00:31:52 +0000 (01:31 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Feb 2015 00:32:30 +0000 (01:32 +0100)
commit1cca12488617077732f8e47c67981e7c1957f296
tree816a3ece3b96e1f59b661355dd3192fd0e6a53e3
parent26db9d3b77fb8187f0a7823e9fdc68473e9648d9
parent0232ba62a28527579e34d44700b48017cc727e5f
Merge commit '0232ba62a28527579e34d44700b48017cc727e5f'

* commit '0232ba62a28527579e34d44700b48017cc727e5f':
  frame: clarify buf documentation

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