[FFmpeg-cvslog] Merge commit 'db21dde3f72c2331653399bdb8745350f015d847'
Michael Niedermayer
git at videolan.org
Tue Jul 28 00:21:17 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Tue Jul 28 00:13:14 2015 +0200| [4ecc9a2f31bfafd5438558311f858ad4c7138214] | committer: Michael Niedermayer
Merge commit 'db21dde3f72c2331653399bdb8745350f015d847'
* commit 'db21dde3f72c2331653399bdb8745350f015d847':
qsvdec_mpeg2: drop an incorrect comment
Conflicts:
libavcodec/qsvdec_mpeg2.c
No change as the removed comment was not in libavcodec/qsvdec_mpeg2.c
Merged-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4ecc9a2f31bfafd5438558311f858ad4c7138214
---
More information about the ffmpeg-cvslog
mailing list