avpacket: fix setting AVPacket.data in av_packet_ref()

[ffmpeg] / libavcodec / g722dec.c

diff --git a/libavcodec/g722dec.c b/libavcodec/g722dec.c
index e7058b7ee1815678fd41c48beb12f027f5d49b32..c4c0ec8feefe1ad30c0bbcde018516f386af0f16 100644 (file)
--- a/libavcodec/g722dec.c
+++ b/libavcodec/g722dec.c
@@ -112,13 +112,13 @@ static int g722_decode_frame(AVCodecContext *avctx, void *data,
         ilow = get_bits(&gb, 6 - skip);
         skip_bits(&gb, skip);
 
-        rlow = av_clip((c->band[0].scale_factor * quantizer_table[ilow] >> 10)
-                      + c->band[0].s_predictor, -16384, 16383);
+        rlow = av_clip_intp2((c->band[0].scale_factor * quantizer_table[ilow] >> 10)
+                      + c->band[0].s_predictor, 14);
 
         ff_g722_update_low_predictor(&c->band[0], ilow >> (2 - skip));
 
         dhigh = c->band[1].scale_factor * ff_g722_high_inv_quant[ihigh] >> 10;
-        rhigh = av_clip(dhigh + c->band[1].s_predictor, -16384, 16383);
+        rhigh = av_clip_intp2(dhigh + c->band[1].s_predictor, 14);
 
         ff_g722_update_high_predictor(&c->band[1], dhigh, ihigh);
 
@@ -147,6 +147,6 @@ AVCodec ff_adpcm_g722_decoder = {
     .priv_data_size = sizeof(G722Context),
     .init           = g722_decode_init,
     .decode         = g722_decode_frame,
-    .capabilities   = CODEC_CAP_DR1,
+    .capabilities   = AV_CODEC_CAP_DR1,
     .priv_class     = &g722_decoder_class,
 };