Merge commit '0337adfab5d14a17bf4d5060aa0425e4049a9862'
authorJames Almer <jamrial@gmail.com>
Sun, 22 Oct 2017 01:53:41 +0000 (22:53 -0300)
committerJames Almer <jamrial@gmail.com>
Sun, 22 Oct 2017 01:53:41 +0000 (22:53 -0300)
commit24a8603a8e0f946e18940119c88d5f77134297ed
tree406ee62ad6daeb698d21f77ab0dd3557ade5bc7b
parent32e18dbfe8e4a0781c09e96512c302019de7f69f
parent0337adfab5d14a17bf4d5060aa0425e4049a9862
Merge commit '0337adfab5d14a17bf4d5060aa0425e4049a9862'

* commit '0337adfab5d14a17bf4d5060aa0425e4049a9862':
  lavc: Drop deprecated missing sample log function

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