Merge commit '89f11f498b9c15bc71494a11a7ec560f4adf630d'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 6 Feb 2013 14:56:24 +0000 (15:56 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 6 Feb 2013 14:57:45 +0000 (15:57 +0100)
commit769eba75eeaa6ee013d7d0573764531e674b6d9b
tree4f05b00113df786611c178c9bfa535bbc36ed819
parent68c0144d028bb65ea93651503b154a056246b03d
parent89f11f498b9c15bc71494a11a7ec560f4adf630d
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>
cmdutils.c
libavcodec/qtrle.c