diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-14 00:03:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-14 00:04:18 +0200 |
| commit | b9918a7688024b178cbfa96ff30362b6eb4f611c (patch) | |
| tree | 19cfe7431ce93c2cbdaa35740655db60b4e0d180 /libavcodec | |
| parent | 40f2b16d527319ad8dfd78a7925b984dc05cfa9e (diff) | |
| parent | c80a816142699dea9cf9fa66689a7838a487ed7e (diff) | |
| download | ffmpeg-b9918a7688024b178cbfa96ff30362b6eb4f611c.tar.gz | |
Merge commit 'c80a816142699dea9cf9fa66689a7838a487ed7e'
* commit 'c80a816142699dea9cf9fa66689a7838a487ed7e':
h263dec: call get_format() on resolution changes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h263dec.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index c5e38fdd84..4ef7825f0c 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -548,6 +548,12 @@ retry: if ((ret = ff_mpv_common_frame_size_change(s))) return ret; + + if (avctx->pix_fmt != h263_get_format(avctx)) { + av_log(avctx, AV_LOG_ERROR, "format change not supported\n"); + avctx->pix_fmt = AV_PIX_FMT_NONE; + return AVERROR_UNKNOWN; + } } if (s->codec_id == AV_CODEC_ID_H263 || |