Merge commit '5d2daebf3cc8de4cee1973db6a2229beaad3b7cd'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 29 Sep 2015 12:12:47 +0000 (14:12 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 29 Sep 2015 12:12:47 +0000 (14:12 +0200)
* commit '5d2daebf3cc8de4cee1973db6a2229beaad3b7cd':
  qsvenc: mark the encoders as INIT_CLEANUP

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavcodec/qsvenc_h264.c
libavcodec/qsvenc_hevc.c
libavcodec/qsvenc_mpeg2.c

Simple merge
Simple merge
Simple merge