diff options
Diffstat (limited to 'contrib/ffmpeg/libavcodec/dxa.c')
| -rw-r--r-- | contrib/ffmpeg/libavcodec/dxa.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/contrib/ffmpeg/libavcodec/dxa.c b/contrib/ffmpeg/libavcodec/dxa.c index fc201ccb4..46b01cd81 100644 --- a/contrib/ffmpeg/libavcodec/dxa.c +++ b/contrib/ffmpeg/libavcodec/dxa.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 - * */ /** @@ -28,7 +27,6 @@ #include <stdio.h> #include <stdlib.h> -#include "common.h" #include "avcodec.h" #include <zlib.h> @@ -189,9 +187,9 @@ static int decode_13(AVCodecContext *avctx, DxaDecContext *c, uint8_t* dst, uint return 0; } -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) { - DxaDecContext * const c = (DxaDecContext *)avctx->priv_data; + DxaDecContext * const c = avctx->priv_data; uint8_t *outptr, *srcptr, *tmpptr; unsigned long dsize; int i, j, compr; @@ -289,7 +287,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8 static int decode_init(AVCodecContext *avctx) { - DxaDecContext * const c = (DxaDecContext *)avctx->priv_data; + DxaDecContext * const c = avctx->priv_data; c->avctx = avctx; avctx->pix_fmt = PIX_FMT_PAL8; @@ -309,7 +307,7 @@ static int decode_init(AVCodecContext *avctx) static int decode_end(AVCodecContext *avctx) { - DxaDecContext * const c = (DxaDecContext *)avctx->priv_data; + DxaDecContext * const c = avctx->priv_data; av_freep(&c->decomp_buf); if(c->prev.data[0]) |