Merge commit '1146bb3babca3973e88005d267cd06210d6ac075'
authorJames Almer <jamrial@gmail.com>
Sun, 22 Oct 2017 02:56:51 +0000 (23:56 -0300)
committerJames Almer <jamrial@gmail.com>
Sun, 22 Oct 2017 02:56:51 +0000 (23:56 -0300)
commit898349d702064906e9b4830999465a1a381afcfb
treecf36dca80baf5f98e336884ceac3a7abb4481a7b
parent5ad1a989b67dedf801abc78ad7dc86ff573c1406
parent1146bb3babca3973e88005d267cd06210d6ac075
Merge commit '1146bb3babca3973e88005d267cd06210d6ac075'

* commit '1146bb3babca3973e88005d267cd06210d6ac075':
  lavc: Drop deprecated voxware codec entry

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