diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-26 20:47:11 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-26 20:47:43 +0200 |
commit | bde8eb7fa33d16cbba0705a18205df4257351e22 (patch) | |
tree | 2ca33c5ba00b2291e05547438b2fff9fe27de81a /libavcodec/webvttdec.c | |
parent | 1964251be7df69122108df89fb619f9a71bfb23f (diff) | |
parent | b5fe13448b13bfdd48a75b7e12387e11e3526d7c (diff) | |
download | ffmpeg-bde8eb7fa33d16cbba0705a18205df4257351e22.tar.gz |
Merge commit 'b5fe13448b13bfdd48a75b7e12387e11e3526d7c'
* commit 'b5fe13448b13bfdd48a75b7e12387e11e3526d7c':
vc1: Use logical instead of bitwise or for coded_inter
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/webvttdec.c')
0 files changed, 0 insertions, 0 deletions