ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Sun 
Jul 19 16:13:35 2015 +0200| [f929081f2e64d979fd8c58b17705e9554f99baf9] | 
committer: Michael Niedermayer

Merge commit 'f5c4d38c78347b09478e21a661befff4b2d44643'

* commit 'f5c4d38c78347b09478e21a661befff4b2d44643':
  qsvdec: properly handle asynchronous decoding

Conflicts:
        libavcodec/qsvdec.c

Merged-by: Michael Niedermayer <[email protected]>

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



_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to