diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 15:44:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 15:44:15 +0100 |
| commit | 0cfbfaaa12e10dbd2d6cdcf9ed618b9bab91ed04 (patch) | |
| tree | 041202962161e4fb791cbd9f8ddb98cf90fc9613 /libavcodec/eamad.c | |
| parent | a75f01d7e0bf166a0b443eb15621753619bb8d88 (diff) | |
| parent | 7b89cd20d844cbe763ca34e63e99d110043cf241 (diff) | |
| download | ffmpeg-0cfbfaaa12e10dbd2d6cdcf9ed618b9bab91ed04.tar.gz | |
Merge commit '7b89cd20d844cbe763ca34e63e99d110043cf241'
* commit '7b89cd20d844cbe763ca34e63e99d110043cf241':
eamad: allocate a dummy reference frame when the real one is missing
Replace remaining includes of audioconvert.h with channel_layout.h
Replace some forgotten instances of PIX_FMT_* with AV_PIX_FMT_*.
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/eamad.c')
| -rw-r--r-- | libavcodec/eamad.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/libavcodec/eamad.c b/libavcodec/eamad.c index 1e8d395ae9..c193d81294 100644 --- a/libavcodec/eamad.c +++ b/libavcodec/eamad.c @@ -271,6 +271,19 @@ static int decode_frame(AVCodecContext *avctx, return ret; } + if (inter && !s->last_frame.data[0]) { + av_log(avctx, AV_LOG_WARNING, "Missing reference frame.\n"); + ret = ff_get_buffer(avctx, &s->last_frame, AV_GET_BUFFER_FLAG_REF); + if (ret < 0) + return ret; + memset(s->last_frame.data[0], 0, s->last_frame.height * + s->last_frame.linesize[0]); + memset(s->last_frame.data[1], 0x80, s->last_frame.height / 2 * + s->last_frame.linesize[1]); + memset(s->last_frame.data[2], 0x80, s->last_frame.height / 2 * + s->last_frame.linesize[2]); + } + av_fast_padded_malloc(&s->bitstream_buf, &s->bitstream_buf_size, buf_end - buf); if (!s->bitstream_buf) |