Merge commit '1202b712690c14f0efb06e4ad8b06c5b3df6822a'
authorJames Almer <jamrial@gmail.com>
Thu, 11 May 2017 17:02:45 +0000 (14:02 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 11 May 2017 17:02:45 +0000 (14:02 -0300)
commitfc63d5ceb357c4b760cb02772de0b50d0557140f
tree6b06c18fc7d8041c943345236cfb1fb64e399374
parent7ac5067146613997bb38442cb022d7f41321a706
parent1202b712690c14f0efb06e4ad8b06c5b3df6822a
Merge commit '1202b712690c14f0efb06e4ad8b06c5b3df6822a'

* commit '1202b712690c14f0efb06e4ad8b06c5b3df6822a':
  theora: export cropping information instead of handling it internally
  h264dec: export cropping information instead of handling it internally
  h264dec: be more explicit in handling container cropping
  hevcdec: export cropping information instead of handling it internally

This commit is a noop.

This changes the cropping behavior, when it's supposedly only meant to move
it outside of the decoder.
See https://ffmpeg.org/pipermail/ffmpeg-devel/2017-May/211239.html for the
discussion about it.

Merged-by: James Almer <jamrial@gmail.com>