]> git.sesse.net Git - ffmpeg/commit - libavfilter/vf_scale.c
Merge commit '69caad8959982580504643d36aef22528e4aa6ce'
authorJames Almer <jamrial@gmail.com>
Tue, 11 Sep 2018 16:42:09 +0000 (13:42 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 11 Sep 2018 16:42:09 +0000 (13:42 -0300)
commit23ce57af3ad684363881cdd66d5724f40963a65c
tree543287ea61f02585a7f8b6c77d0b7aac6d2011a9
parent50ae1f7e0ff1fa00236622415039f7e28d919a25
parent69caad8959982580504643d36aef22528e4aa6ce
Merge commit '69caad8959982580504643d36aef22528e4aa6ce'

* commit '69caad8959982580504643d36aef22528e4aa6ce':
  qsvdec: Release packet on decoding failure for  mpeg2/vp8/vc1

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