projects / ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9266cc5 984736d)
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)
* commit '984736dd9e5b50987a5910e22495304e4a6d975c':
  lavc: make sure not to return EAGAIN from codecs

Merged-by: James Almer <jamrial@gmail.com>
1  2 
libavcodec/aacdec.c patch | diff1 | diff2 | blob | history
libavcodec/qsv.c patch | diff1 | diff2 | blob | history

diff --cc libavcodec/aacdec.c
Simple merge
diff --cc libavcodec/qsv.c
Simple merge
FFmpeg git repo