summaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>2008-05-12 19:04:08 +0000
committerCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>2008-05-12 19:04:08 +0000
commit3f8adf26a45f9fb56cad880598e202b469fa60aa (patch)
treede4f05f99aba8fb081bd45b4095894b5d0f44710 /libavcodec
parent4c25d159b1bb3583b8a17c8e97fff5ba5e742378 (diff)
downloadffmpeg-streaming-3f8adf26a45f9fb56cad880598e202b469fa60aa.zip
ffmpeg-streaming-3f8adf26a45f9fb56cad880598e202b469fa60aa.tar.gz
Correct type for pcx_rle_decode().
Fixes icc warning #120: return value type does not match the function type Originally committed as revision 13139 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/pcx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/pcx.c b/libavcodec/pcx.c
index 785f715..946d382 100644
--- a/libavcodec/pcx.c
+++ b/libavcodec/pcx.c
@@ -42,7 +42,7 @@ static av_cold int pcx_init(AVCodecContext *avctx) {
/**
* @return advanced src pointer
*/
-static const char *pcx_rle_decode(const uint8_t *src, uint8_t *dst,
+static const uint8_t *pcx_rle_decode(const uint8_t *src, uint8_t *dst,
unsigned int bytes_per_scanline) {
unsigned int i = 0;
unsigned char run, value;
OpenPOWER on IntegriCloud