Remove hackish support for the non-free fixed-point AMR-NB reference code.

[ffmpeg] / libavcodec / lcl.c

diff --git a/libavcodec/lcl.c b/libavcodec/lcl.c
index b02ea1543f54d26dee3a6afc1b86b45ce27f5a9c..f214b0a8b2574ca2d71715ac5cbc2c4b7cbe6cfd 100644 (file)
--- a/libavcodec/lcl.c
+++ b/libavcodec/lcl.c
@@ -200,7 +200,7 @@ static unsigned int mszh_decomp(unsigned char * srcptr, int srclen, unsigned cha
  */
 static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8_t *buf, int buf_size)
 {
-        LclContext * const c = (LclContext *)avctx->priv_data;
+        LclContext * const c = avctx->priv_data;
         unsigned char *encoded = (unsigned char *)buf;
     unsigned int pixel_ptr;
     int row, col;
@@ -617,14 +617,13 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size,
  */
 static int decode_init(AVCodecContext *avctx)
 {
-    LclContext * const c = (LclContext *)avctx->priv_data;
+    LclContext * const c = avctx->priv_data;
     unsigned int basesize = avctx->width * avctx->height;
     unsigned int max_basesize = ((avctx->width + 3) & ~3) * ((avctx->height + 3) & ~3);
     unsigned int max_decomp_size;
     int zret; // Zlib return code
 
     c->avctx = avctx;
-    avctx->has_b_frames = 0;
 
     c->pic.data[0] = NULL;
 
@@ -853,7 +852,7 @@ static int encode_init(AVCodecContext *avctx)
  */
 static int decode_end(AVCodecContext *avctx)
 {
-        LclContext * const c = (LclContext *)avctx->priv_data;
+        LclContext * const c = avctx->priv_data;
 
         if (c->pic.data[0])
                 avctx->release_buffer(avctx, &c->pic);