Merge commit '7a6cf2771414c7ab8bca0811d589f6091a6e2b71'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 13 Apr 2016 15:11:39 +0000 (16:11 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 13 Apr 2016 15:11:39 +0000 (16:11 +0100)
commitbe6b58a98171030687cb0a770589207a5811c92d
treed934c448fd9eee167378481f464ad207017b324c
parent3bf368a2a643291442829bf2b7583f7a8a0eee47
parent7a6cf2771414c7ab8bca0811d589f6091a6e2b71
Merge commit '7a6cf2771414c7ab8bca0811d589f6091a6e2b71'

* commit '7a6cf2771414c7ab8bca0811d589f6091a6e2b71':
  lavu: improve documentation of some AVFrame functions

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavutil/frame.h