camstudio: broken output with 16bpp and odd width

[ami_stuff]

decodes correctly with original codec

(no problem with 24/32bpp modes)

C:\>ffmpeg -i 1023_gzip_16bpp.avi out.bmp
ffmpeg version N-39494-g41a097a Copyright (c) 2000-2012 the FFmpeg developers
  built on Apr  3 2012 20:20:04 with gcc 4.6.2
  configuration: --enable-gpl --enable-version3 --disable-w32threads --enable-ru
ntime-cpudetect --enable-avisynth --enable-bzlib --enable-frei0r --enable-libope
ncore-amrnb --enable-libopencore-amrwb --enable-libfreetype --enable-libgsm --en
able-libmp3lame --enable-libopenjpeg --enable-librtmp --enable-libschroedinger -
-enable-libspeex --enable-libtheora --enable-libvo-aacenc --enable-libvo-amrwben
c --enable-libvorbis --enable-libvpx --enable-libx264 --enable-libxavs --enable-
libxvid --enable-zlib
  libavutil      51. 44.100 / 51. 44.100
  libavcodec     54. 12.100 / 54. 12.100
  libavformat    54.  3.100 / 54.  3.100
  libavdevice    53.  4.100 / 53.  4.100
  libavfilter     2. 66.101 /  2. 66.101
  libswscale      2.  1.100 /  2.  1.100
  libswresample   0. 10.100 /  0. 10.100
  libpostproc    52.  0.100 / 52.  0.100
Input #0, avi, from '1023_gzip_16bpp.avi':

  Duration: 00:00:00.10, start: 0.000000, bitrate: 47047 kb/s
    Stream #0:0: Video: camstudio (CSCD / 0x44435343), rgb555le, 1023x768, 10 tb
r, 10 tbn, 10 tbc
[buffer @ 02191DE0] w:1023 h:768 pixfmt:rgb555le tb:1/1000000 sar:0/1 sws_param:
flags=2
Output #0, image2, to 'out.bmp':
  Metadata:
    encoder         : Lavf54.3.100
    Stream #0:0: Video: bmp, rgb555le, 1023x768, q=2-31, 200 kb/s, 90k tbn, 10 t
bc
Stream mapping:
  Stream #0:0 -> #0:0 (camstudio -> bmp)
Press [q] to stop, [?] for help
[camstudio @ 02182320] error during zlib decompression
frame=    1 fps=0.0 q=0.0 Lsize=       0kB time=00:00:00.10 bitrate=   0.0kbits/
s
video:1536kB audio:0kB global headers:0kB muxing overhead -100.000000%

[Carl Eugen Hoyos]

Patch on mailing list.

[Carl Eugen Hoyos]

Could you test width 1022?

[ami_stuff]

Your patch works correctly with 1022 and some random even/odd widths.

[Carl Eugen Hoyos]

Different patch applied, should be fixed.