Merge commit '728ea23cce07467b732f538c87c13da13dd6dcf3'
authorJames Almer <jamrial@gmail.com>
Tue, 4 Apr 2017 17:41:23 +0000 (14:41 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 4 Apr 2017 17:41:23 +0000 (14:41 -0300)
commit52bce9a13ddca52921c8a32ffcdd2d97b15d0f4d
tree3b773d93977f81c9cb07e3db3abf4b530c080a56
parentfddd6af45cfdb228cd34c36210a8afd39757a6c8
parent728ea23cce07467b732f538c87c13da13dd6dcf3
Merge commit '728ea23cce07467b732f538c87c13da13dd6dcf3'

* commit '728ea23cce07467b732f538c87c13da13dd6dcf3':
  examples/decode_video: switch to the new decoding API

Merged-by: James Almer <jamrial@gmail.com>
doc/examples/decode_video.c