Merge commit '48bb0da050329e5111b00a12dfc154b7e78fb3a3'
authorJames Almer <jamrial@gmail.com>
Mon, 23 Oct 2017 19:37:30 +0000 (16:37 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 23 Oct 2017 19:38:04 +0000 (16:38 -0300)
commitd2484639bc205112f3841b14424b7744a92fd5e1
tree6a28aeaa53e1b4a25554d9198db978889642bdb9
parent2ccd00dabd5ab4fa2550377be823a521df80c141
parent48bb0da050329e5111b00a12dfc154b7e78fb3a3
Merge commit '48bb0da050329e5111b00a12dfc154b7e78fb3a3'

* commit '48bb0da050329e5111b00a12dfc154b7e78fb3a3':
  lavc: Drop deprecated way of setting audio delay on encode

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