virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-19 09:02:26 +02:00
Code Issues Releases Activity

h263dec: call get_format after setting resolution and profile

Browse Source 
Bug-Id: 541
This commit is contained in:
Rémi Denis-Courmont 2014-10-08 20:37:00 +03:00 committed by Janne Grunau
parent 76c70e33d2
commit 1f29e5d7a2
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavcodec/h263dec.c
View File

@ -40,6 +40,14 @@
#include "qpeldsp.h" #include "qpeldsp.h"
#include "thread.h" #include "thread.h"
static enum AVPixelFormat h263_get_format(AVCodecContext *avctx)
{
if (avctx->codec->id == AV_CODEC_ID_MSS2)
return AV_PIX_FMT_YUV420P;
return avctx->pix_fmt = ff_get_format(avctx, avctx->codec->pix_fmts);
}
av_cold int ff_h263_decode_init(AVCodecContext *avctx) av_cold int ff_h263_decode_init(AVCodecContext *avctx)
{ {
MpegEncContext *s = avctx->priv_data; MpegEncContext *s = avctx->priv_data;
@ -56,10 +64,6 @@ av_cold int ff_h263_decode_init(AVCodecContext *avctx)
s->quant_precision = 5; s->quant_precision = 5;
s->decode_mb = ff_h263_decode_mb; s->decode_mb = ff_h263_decode_mb;
s->low_delay = 1; s->low_delay = 1;
if (avctx->codec->id == AV_CODEC_ID_MSS2)
avctx->pix_fmt = AV_PIX_FMT_YUV420P;
else
avctx->pix_fmt = ff_get_format(avctx, avctx->codec->pix_fmts);
s->unrestricted_mv = 1; s->unrestricted_mv = 1;
/* select sub codec */ /* select sub codec */
@ -114,6 +118,7 @@ av_cold int ff_h263_decode_init(AVCodecContext *avctx)
/* for h263, we allocate the images after having read the header */ /* for h263, we allocate the images after having read the header */
if (avctx->codec->id != AV_CODEC_ID_H263 && if (avctx->codec->id != AV_CODEC_ID_H263 &&
avctx->codec->id != AV_CODEC_ID_MPEG4) { avctx->codec->id != AV_CODEC_ID_MPEG4) {
avctx->pix_fmt = h263_get_format(avctx);
ff_mpv_idct_init(s); ff_mpv_idct_init(s);
if ((ret = ff_mpv_common_init(s)) < 0) if ((ret = ff_mpv_common_init(s)) < 0)
return ret; return ret;
@ -454,9 +459,11 @@ int ff_h263_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
return ret; return ret;
} }
if (!s->context_initialized) if (!s->context_initialized) {
avctx->pix_fmt = h263_get_format(avctx);
if ((ret = ff_mpv_common_init(s)) < 0) if ((ret = ff_mpv_common_init(s)) < 0)
return ret; return ret;
}
if (!s->current_picture_ptr || s->current_picture_ptr->f->data[0]) { if (!s->current_picture_ptr || s->current_picture_ptr->f->data[0]) {
int i = ff_find_unused_picture(s, 0); int i = ff_find_unused_picture(s, 0);