Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 18 May 2013 12:27:07 +0000 (14:27 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 18 May 2013 12:31:01 +0000 (14:31 +0200)
commited0aed09e8a19d255963c21c7aeda18cee3d9422
tree59457517f96fdcd372f73da491372314a3d158d6
parent849bb62c2c9afdb1e81f44870645a6990c4ce1fc
parent350914fc8024612f614c0a4f5c8ba5da2d9988e7
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Escape 130 (RPL) decoder

Conflicts:
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/codec_desc.c
libavcodec/escape130.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
libavcodec/avcodec.h
libavcodec/escape130.c
libavcodec/utils.c
libavcodec/version.h