Merge commit '984736dd9e5b50987a5910e22495304e4a6d975c'
authorJames Almer <jamrial@gmail.com>
Tue, 3 Oct 2017 23:35:17 +0000 (20:35 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 3 Oct 2017 23:52:44 +0000 (20:52 -0300)
commit5678b2a82074e4926ce0b73dc4e1190c8dfcd35d
treee333583259781d18fdb57d3d1bf754899ca69303
parent9266cc54aa5c882c16d994ce1b0f6043ba9c2a87
parent984736dd9e5b50987a5910e22495304e4a6d975c
Merge commit '984736dd9e5b50987a5910e22495304e4a6d975c'

* commit '984736dd9e5b50987a5910e22495304e4a6d975c':
  lavc: make sure not to return EAGAIN from codecs

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