Merge commit '0c1d66a07917602303f129f5a5651faeec2415d5'
authorClément Bœsch <u@pkh.me>
Tue, 21 Jun 2016 20:22:51 +0000 (22:22 +0200)
committerClément Bœsch <u@pkh.me>
Tue, 21 Jun 2016 20:22:51 +0000 (22:22 +0200)
commit91450cda2ee112c45e5c7ce1dd5651b811ecad8c
tree472cd2140c0edfabc1b77e01ee01e7fbb99c176e
parent475a686a0157a4f0243a0df4a02fadf469e5159c
parent0c1d66a07917602303f129f5a5651faeec2415d5
Merge commit '0c1d66a07917602303f129f5a5651faeec2415d5'

* commit '0c1d66a07917602303f129f5a5651faeec2415d5':
  avconv_vaapi: fix double-free with some unsupported streams

Merged-by: Clément Bœsch <u@pkh.me>
ffmpeg_vaapi.c