Merge commit 'c6303f8d70c25dd6c6e6486c78bf99c9924e2b6b'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Dec 2012 14:42:52 +0000 (15:42 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Dec 2012 14:48:02 +0000 (15:48 +0100)
commit9dbedf331eca9903230368f28716f29e7375450a
treee74d461ecc2c8d5d58e8270e42e9391b89b3dd30
parentba8e909c825164a74a4fc580286200a9165e019c
parentc6303f8d70c25dd6c6e6486c78bf99c9924e2b6b
Merge commit 'c6303f8d70c25dd6c6e6486c78bf99c9924e2b6b'

* commit 'c6303f8d70c25dd6c6e6486c78bf99c9924e2b6b':
  yop: simplify/sanitize the decoding loop
  c93: set palette_has_changed.
  bmp: cosmetics, reformat
  hlsenc: Don't duplicate a string constant

Conflicts:
libavcodec/bmp.c
tests/ref/fate/yop

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/bmp.c
libavcodec/c93.c
libavcodec/yop.c
tests/ref/fate/yop