summaryrefslogtreecommitdiff
path: root/libavcodec/g2meet.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-01 14:50:02 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-01 14:54:40 +0100
commite6b9d71ad9569b5d033058958da5155100ada1ab (patch)
tree963773bd0d58dea1732b6b5c15b1cdb77e9db580 /libavcodec/g2meet.c
parent599c285162197dae164704131b8f3ff6276c8496 (diff)
parent3b086317277e3f3b61c0343930d8e2570b278bd6 (diff)
downloadffmpeg-e6b9d71ad9569b5d033058958da5155100ada1ab.tar.gz
Merge commit '3b086317277e3f3b61c0343930d8e2570b278bd6'
* commit '3b086317277e3f3b61c0343930d8e2570b278bd6': h26[13]dec: stop using deprecated avcodec_set_dimensions gifdec: stop using deprecated avcodec_set_dimensions g2meet: stop using deprecated avcodec_set_dimensions Conflicts: libavcodec/gifdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g2meet.c')
-rw-r--r--libavcodec/g2meet.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c
index 16671497d6..acd9b19cc6 100644
--- a/libavcodec/g2meet.c
+++ b/libavcodec/g2meet.c
@@ -701,7 +701,7 @@ static int g2m_decode_frame(AVCodecContext *avctx, void *data,
goto header_fail;
}
if (c->width != avctx->width || c->height != avctx->height)
- avcodec_set_dimensions(avctx, c->width, c->height);
+ ff_set_dimensions(avctx, c->width, c->height);
c->compression = bytestream2_get_be32(&bc);
if (c->compression != 2 && c->compression != 3) {
av_log(avctx, AV_LOG_ERROR,