Merge commit '019ab88a95cb31b698506d90e8ce56695a7f1cc5'
authorJames Almer <jamrial@gmail.com>
Mon, 8 May 2017 16:11:17 +0000 (13:11 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 8 May 2017 17:22:43 +0000 (14:22 -0300)
commitf089e02fa2b7716d9fa5228c734e55678437db85
treeff8ec50c447f2e23dadf83535093655d96ebe5e0
parenta47bd5d77e3f1dd8bb3d4ba0955bd7b1323c7d83
parent019ab88a95cb31b698506d90e8ce56695a7f1cc5
Merge commit '019ab88a95cb31b698506d90e8ce56695a7f1cc5'

* commit '019ab88a95cb31b698506d90e8ce56695a7f1cc5':
  lavc: add an option for exporting cropping information to the caller

Merged-by: James Almer <jamrial@gmail.com>
doc/APIchanges
libavcodec/avcodec.h
libavcodec/decode.c
libavcodec/internal.h
libavcodec/options_table.h
libavcodec/version.h
tests/ref/fate/api-mjpeg-codec-param
tests/ref/fate/api-png-codec-param