summaryrefslogtreecommitdiffstats
path: root/libavcodec/dvdec.c
diff options
context:
space:
mode:
authorVittorio Giovara <vittorio.giovara@gmail.com>2015-10-02 12:43:39 +0200
committerVittorio Giovara <vittorio.giovara@gmail.com>2015-10-04 13:06:34 +0200
commitcab63a8b594cdc365bb2581a12b3ac8e6dd480b2 (patch)
treea8412fc1261ef47bb42f92d3fd6393bf4bd7c0ed /libavcodec/dvdec.c
parent4c160fa23996c05efcd952ccfac2359311d8a1bc (diff)
downloadffmpeg-streaming-cab63a8b594cdc365bb2581a12b3ac8e6dd480b2.zip
ffmpeg-streaming-cab63a8b594cdc365bb2581a12b3ac8e6dd480b2.tar.gz
dv: Mark internal frame reference as const
Silence a warning due to frame assignment in dvenc. All uses of the reference in dvdec are read only, except the ones in the main decoding function, so use the frame pointer directly there.
Diffstat (limited to 'libavcodec/dvdec.c')
-rw-r--r--libavcodec/dvdec.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/libavcodec/dvdec.c b/libavcodec/dvdec.c
index 9ee9933..463d108 100644
--- a/libavcodec/dvdec.c
+++ b/libavcodec/dvdec.c
@@ -350,6 +350,7 @@ static int dvvideo_decode_frame(AVCodecContext *avctx, void *data,
uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
DVVideoContext *s = avctx->priv_data;
+ AVFrame *frame = data;
const uint8_t *vsc_pack;
int apt, is16_9, ret;
const AVDVProfile *sys;
@@ -369,9 +370,9 @@ static int dvvideo_decode_frame(AVCodecContext *avctx, void *data,
s->sys = sys;
}
- s->frame = data;
- s->frame->key_frame = 1;
- s->frame->pict_type = AV_PICTURE_TYPE_I;
+ s->frame = frame;
+ frame->key_frame = 1;
+ frame->pict_type = AV_PICTURE_TYPE_I;
avctx->pix_fmt = s->sys->pix_fmt;
avctx->framerate = av_inv_q(s->sys->time_base);
@@ -388,12 +389,12 @@ static int dvvideo_decode_frame(AVCodecContext *avctx, void *data,
ff_set_sar(avctx, s->sys->sar[is16_9]);
}
- if (ff_get_buffer(avctx, s->frame, 0) < 0) {
+ if (ff_get_buffer(avctx, frame, 0) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return -1;
}
- s->frame->interlaced_frame = 1;
- s->frame->top_field_first = 0;
+ frame->interlaced_frame = 1;
+ frame->top_field_first = 0;
s->buf = buf;
avctx->execute(avctx, dv_decode_video_segment, s->work_chunks, NULL,
OpenPOWER on IntegriCloud