Merge commit '328cd2b599bc2d0d38f3c12606fa2a66eeec016e'
authorJames Almer <jamrial@gmail.com>
Fri, 7 Apr 2017 03:42:38 +0000 (00:42 -0300)
committerJames Almer <jamrial@gmail.com>
Fri, 7 Apr 2017 03:42:38 +0000 (00:42 -0300)
commitbd9057e74bcddd8893596e02d52e938e63c8cd6a
treef66150d7d9d1691cecea5d232c4f6394a31e41c9
parent51d8a2572fd8d945d4e7a87b241e894b7f058dc0
parent328cd2b599bc2d0d38f3c12606fa2a66eeec016e
Merge commit '328cd2b599bc2d0d38f3c12606fa2a66eeec016e'

* commit '328cd2b599bc2d0d38f3c12606fa2a66eeec016e':
  lavc: move encoding-related code from utils.c to a new file

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