diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-28 00:13:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-28 00:13:14 +0200 |
| commit | 4ecc9a2f31bfafd5438558311f858ad4c7138214 (patch) | |
| tree | 649170b922ae4641f2519d9645db950d1a9256d2 | |
| parent | 146730480265dc2ce23f18a15b9edf2129b54185 (diff) | |
| parent | db21dde3f72c2331653399bdb8745350f015d847 (diff) | |
| download | ffmpeg-streaming-4ecc9a2f31bfafd5438558311f858ad4c7138214.zip ffmpeg-streaming-4ecc9a2f31bfafd5438558311f858ad4c7138214.tar.gz | |
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@niedermayer.cc>
0 files changed, 0 insertions, 0 deletions
