Merge commit '045654f422e74be8ed09a0819d39051d67633a09'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 17 Jan 2014 14:05:17 +0000 (15:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 17 Jan 2014 14:05:24 +0000 (15:05 +0100)
commit045d80076a67aade020417f4adcb026b6a3da823
treef7c3507a9e608d9eaf1ff699bff5900230eabfeb
parent68ebf70f665bee7a55e99013eec51963429b8f4e
parent045654f422e74be8ed09a0819d39051d67633a09
Merge commit '045654f422e74be8ed09a0819d39051d67633a09'

* commit '045654f422e74be8ed09a0819d39051d67633a09':
  doxy: Document better the available AVFrame flags

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