diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-05-02 02:15:15 +0200 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-05-07 12:03:59 +0200 |
| commit | 01042d4123b6e0a4c15d6828f835bd648eb03d38 (patch) | |
| tree | 1effe8a600ae996aaa2f0a036b6ce7e87bbd09a8 /libavcodec/escape124.c | |
| parent | 2beac7c325583160bdf2978de6e87176b9146da0 (diff) | |
| download | ffmpeg-01042d4123b6e0a4c15d6828f835bd648eb03d38.tar.gz | |
lavc: set defaults in internal codec frames
This is required specifically for setting frame->format to -1,
otherwise it will be set to 0 = PIX_FMT_YUV420P and code reading
the format from the output decoded frame will get misled.
In particular fix regressions occurring with the pending vsrc_buffer
patch.
Diffstat (limited to 'libavcodec/escape124.c')
| -rw-r--r-- | libavcodec/escape124.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/escape124.c b/libavcodec/escape124.c index 5a6769d342..12e478fe19 100644 --- a/libavcodec/escape124.c +++ b/libavcodec/escape124.c @@ -61,6 +61,7 @@ static av_cold int escape124_decode_init(AVCodecContext *avctx) { Escape124Context *s = avctx->priv_data; + avcodec_get_frame_defaults(&s->frame); avctx->pix_fmt = PIX_FMT_RGB555; s->num_superblocks = ((unsigned)avctx->width / 8) * @@ -214,7 +215,8 @@ static int escape124_decode_frame(AVCodecContext *avctx, uint16_t* old_frame_data, *new_frame_data; unsigned old_stride, new_stride; - AVFrame new_frame = { { 0 } }; + AVFrame new_frame; + avcodec_get_frame_defaults(&new_frame); init_get_bits(&gb, buf, buf_size * 8); |