diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-06 15:56:24 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-06 15:57:45 +0100 |
commit | 769eba75eeaa6ee013d7d0573764531e674b6d9b (patch) | |
tree | 4f05b00113df786611c178c9bfa535bbc36ed819 /libavcodec/mpeg12data.h | |
parent | 68c0144d028bb65ea93651503b154a056246b03d (diff) | |
parent | 89f11f498b9c15bc71494a11a7ec560f4adf630d (diff) | |
download | ffmpeg-769eba75eeaa6ee013d7d0573764531e674b6d9b.tar.gz |
Merge commit '89f11f498b9c15bc71494a11a7ec560f4adf630d'
* commit '89f11f498b9c15bc71494a11a7ec560f4adf630d':
qtrle: fix the topmost line for 1bit
Conflicts:
tests/ref/fate/qtrle-1bit
See: 1af91978dbab35ba9fdede187577c00d643ae33b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg12data.h')
0 files changed, 0 insertions, 0 deletions