Merge commit '7c25523cc8e618e77dc84d960e41e9644eaf8c33'
authorJames Almer <jamrial@gmail.com>
Mon, 30 Oct 2017 17:20:58 +0000 (14:20 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 30 Oct 2017 17:25:15 +0000 (14:25 -0300)
commitb428d445a8175ecd872b56a2c3272326c48a5eb9
tree33228a48cb530f7d0a298fc13bc81ab9cb8dcbb1
parentba45ca0e62e251279508785bf93872f9c3b226a2
parent7c25523cc8e618e77dc84d960e41e9644eaf8c33
Merge commit '7c25523cc8e618e77dc84d960e41e9644eaf8c33'

* commit '7c25523cc8e618e77dc84d960e41e9644eaf8c33':
  utvideodec: Fix decoding odd sizes with interlaced video with some formats

See 9ef21a897c64417a0575cbc6fad6222f3163d103

Merged-by: James Almer <jamrial@gmail.com>
libavcodec/utvideodec.c