generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '1f29e5d7a2b0950f3b6820896e97e2c02e6a10a9'

Browse Source 
* commit '1f29e5d7a2b0950f3b6820896e97e2c02e6a10a9':
  h263dec: call get_format after setting resolution and profile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-10-13 22:12:56 +02:00
commit d3d265bae2
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

@ -43,6 +43,14 @@
#include "vdpau_internal.h" #include "vdpau_internal.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;
@ -57,10 +65,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 */
@ -120,6 +124,7 @@ av_cold int ff_h263_decode_init(AVCodecContext *avctx)
if (avctx->codec->id != AV_CODEC_ID_H263 && if (avctx->codec->id != AV_CODEC_ID_H263 &&
avctx->codec->id != AV_CODEC_ID_H263P && avctx->codec->id != AV_CODEC_ID_H263P &&
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;
@ -505,9 +510,11 @@ retry:
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);