ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Sat
Jul 25 23:10:14 2015 +0200| [ef2a85ac532117b13087f3ceabeb450f12d26c7e] |
committer: Michael Niedermayer
Merge commit 'aa9d15d89bb4ee8a31607d3db1b8c5334eb88d2d'
* commit 'aa9d15d89bb4ee8a31607d3db1b8c5334eb88d2d':
qsvdec: avoid an infinite loop with no consumed data and no output
Conflicts:
libavcodec/qsvdec.c
Merged-by: Michael Niedermayer <mich...@niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ef2a85ac532117b13087f3ceabeb450f12d26c7e
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
