diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-11 23:48:32 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-11 23:48:32 +0400 |
commit | d93cf093f840b9a28481c73d7e421f469f2ca4e7 (patch) | |
tree | 6159a41d2f67277f41953dd72ae349c3e2670155 /libavcodec/h263dec.c | |
parent | 5e95551199871e5912c7bd498cbcc502d33113aa (diff) | |
parent | 632ad2248e2e5d8cd4b51e6c87c943a38c3da425 (diff) |
Merge commit '632ad2248e2e5d8cd4b51e6c87c943a38c3da425'
* commit '632ad2248e2e5d8cd4b51e6c87c943a38c3da425':
lavc: Add an internal wrapper around get_format()
Conflicts:
libavcodec/h264_slice.c
libavcodec/mpeg12dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h263dec.c')
-rw-r--r-- | libavcodec/h263dec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 474714ed77..0eba2f9141 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -60,7 +60,7 @@ av_cold int ff_h263_decode_init(AVCodecContext *avctx) if (avctx->codec->id == AV_CODEC_ID_MSS2) avctx->pix_fmt = AV_PIX_FMT_YUV420P; else - avctx->pix_fmt = avctx->get_format(avctx, avctx->codec->pix_fmts); + avctx->pix_fmt = ff_get_format(avctx, avctx->codec->pix_fmts); s->unrestricted_mv = 1; /* select sub codec */ |