[FFmpeg-cvslog] Merge commit '22522d9c2c69624fe4d81d61ee65a56610f22f1d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sat Jul 25 23:28:39 2015 +0200| [c3413a712ac23d74a7a0474a6100753d538b79cd] | committer: Michael Niedermayer

Merge commit '22522d9c2c69624fe4d81d61ee65a56610f22f1d'

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

Conflicts:
	libavcodec/qsvdec.c

Merged-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c3413a712ac23d74a7a0474a6100753d538b79cd
---