Merge commit 'e5e8a26dcf6d572e841a7a191e4c96524367e3f9'
authorJames Almer <jamrial@gmail.com>
Fri, 31 Mar 2017 19:10:12 +0000 (16:10 -0300)
committerJames Almer <jamrial@gmail.com>
Fri, 31 Mar 2017 19:10:32 +0000 (16:10 -0300)
commit804ae6e30fc7479283b3f2654a4c7cee16932b28
tree110b10e0821f304680b2d6f2149c632af563176a
parentef516efad445c319e202334204498a8a39a24f13
parente5e8a26dcf6d572e841a7a191e4c96524367e3f9
Merge commit 'e5e8a26dcf6d572e841a7a191e4c96524367e3f9'

* commit 'e5e8a26dcf6d572e841a7a191e4c96524367e3f9':
  libxvid: Use proper context in av_log() calls

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