diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-03-01 03:05:13 +0100 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-03-01 03:05:13 +0100 |
| commit | 1d0b3b20c34517b9d1ddf3ea347776304b0c4b44 (patch) | |
| tree | 89f4fc640c2becc6f00ae08996754952ecf149c1 /contrib/ffmpeg/libavcodec/tscc.c | |
| parent | 09496ad3469a0ade8dbd9a351e639b78f20b7942 (diff) | |
| download | xine-lib-1d0b3b20c34517b9d1ddf3ea347776304b0c4b44.tar.gz xine-lib-1d0b3b20c34517b9d1ddf3ea347776304b0c4b44.tar.bz2 | |
Update internal FFmpeg copy.
Diffstat (limited to 'contrib/ffmpeg/libavcodec/tscc.c')
| -rw-r--r-- | contrib/ffmpeg/libavcodec/tscc.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/contrib/ffmpeg/libavcodec/tscc.c b/contrib/ffmpeg/libavcodec/tscc.c index 1453eb568..30bb19f97 100644 --- a/contrib/ffmpeg/libavcodec/tscc.c +++ b/contrib/ffmpeg/libavcodec/tscc.c @@ -17,7 +17,6 @@ * You should have received a copy of the GNU Lesser General Public * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * */ /** @@ -39,7 +38,6 @@ #include <stdio.h> #include <stdlib.h> -#include "common.h" #include "avcodec.h" #ifdef CONFIG_ZLIB @@ -184,10 +182,10 @@ static int decode_rle(CamtasiaContext *c, unsigned int srcsize) * Decode a frame * */ -static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8_t *buf, int buf_size) +static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, const uint8_t *buf, int buf_size) { - CamtasiaContext * const c = (CamtasiaContext *)avctx->priv_data; - unsigned char *encoded = (unsigned char *)buf; + CamtasiaContext * const c = avctx->priv_data; + const unsigned char *encoded = buf; unsigned char *outptr; #ifdef CONFIG_ZLIB int zret; // Zlib return code @@ -257,7 +255,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8 */ static int decode_init(AVCodecContext *avctx) { - CamtasiaContext * const c = (CamtasiaContext *)avctx->priv_data; + CamtasiaContext * const c = avctx->priv_data; int zret; // Zlib return code c->avctx = avctx; @@ -320,7 +318,7 @@ static int decode_init(AVCodecContext *avctx) */ static int decode_end(AVCodecContext *avctx) { - CamtasiaContext * const c = (CamtasiaContext *)avctx->priv_data; + CamtasiaContext * const c = avctx->priv_data; av_freep(&c->decomp_buf); |