Merge commit '07761294fc3f08e139e8a406ef7d5b63aaf1ecee'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 19 Apr 2014 17:12:57 +0000 (19:12 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 19 Apr 2014 17:26:46 +0000 (19:26 +0200)
commite37dbfddda0380fd9ea9ba1bbae8a5ab2afc6573
tree6d466e4b5f4f4e661031f14453a62ab2b86d0776
parent928b5708f94c50e8cb0b982208a2d097b0d588c2
parent07761294fc3f08e139e8a406ef7d5b63aaf1ecee
Merge commit '07761294fc3f08e139e8a406ef7d5b63aaf1ecee'

* commit '07761294fc3f08e139e8a406ef7d5b63aaf1ecee':
  Silicon Graphics RLE 8-bit video decoder

Conflicts:
Changelog
doc/general.texi
libavcodec/avcodec.h
libavcodec/sgirledec.c
libavcodec/version.h

See: afa1617b937f3675f74c6351a46c45f8c24d67f2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
doc/general.texi
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/sgirledec.c
libavcodec/utils.c
libavcodec/version.h