Merge commit '22522d9c2c69624fe4d81d61ee65a56610f22f1d'
authorMichael Niedermayer <michael@niedermayer.cc>
Sat, 25 Jul 2015 21:28:39 +0000 (23:28 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Sat, 25 Jul 2015 21:28:39 +0000 (23:28 +0200)
commitc3413a712ac23d74a7a0474a6100753d538b79cd
tree9907918d9f67577146990f2393a64163e28445be
parentef2a85ac532117b13087f3ceabeb450f12d26c7e
parent22522d9c2c69624fe4d81d61ee65a56610f22f1d
Merge commit '22522d9c2c69624fe4d81d61ee65a56610f22f1d'

* commit '22522d9c2c69624fe4d81d61ee65a56610f22f1d':
  qsvdec: fix a memleak of async_fifo

Conflicts:
libavcodec/qsvdec.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/qsvdec.c