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 | |
| 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')
| -rw-r--r-- | libavcodec/012v.c | 2 | ||||
| -rw-r--r-- | libavcodec/eamad.c | 13 | ||||
| -rw-r--r-- | libavcodec/h264.c | 2 | ||||
| -rw-r--r-- | libavcodec/svq1enc.c | 4 |
4 files changed, 17 insertions, 4 deletions
diff --git a/libavcodec/012v.c b/libavcodec/012v.c index 51c0d0ca0f..bb915c2e8b 100644 --- a/libavcodec/012v.c +++ b/libavcodec/012v.c @@ -26,7 +26,7 @@ static av_cold int zero12v_decode_init(AVCodecContext *avctx) { - avctx->pix_fmt = PIX_FMT_YUV422P16; + avctx->pix_fmt = AV_PIX_FMT_YUV422P16; avctx->bits_per_raw_sample = 10; if (avctx->codec_tag == MKTAG('a', '1', '2', 'v')) 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) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index aa63316e1c..4e16d5e896 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2988,7 +2988,7 @@ static int h264_set_parameter_from_sps(H264Context *h) return 0; } -static enum PixelFormat get_pixel_format(H264Context *h, int force_callback) +static enum AVPixelFormat get_pixel_format(H264Context *h, int force_callback) { switch (h->sps.bit_depth_luma) { case 9: diff --git a/libavcodec/svq1enc.c b/libavcodec/svq1enc.c index cfa06f3655..7b79bc06b1 100644 --- a/libavcodec/svq1enc.c +++ b/libavcodec/svq1enc.c @@ -625,7 +625,7 @@ AVCodec ff_svq1_encoder = { .init = svq1_encode_init, .encode2 = svq1_encode_frame, .close = svq1_encode_end, - .pix_fmts = (const enum PixelFormat[]) { AV_PIX_FMT_YUV410P, - AV_PIX_FMT_NONE }, + .pix_fmts = (const enum AVPixelFormat[]) { AV_PIX_FMT_YUV410P, + AV_PIX_FMT_NONE }, .long_name = NULL_IF_CONFIG_SMALL("Sorenson Vector Quantizer 1 / Sorenson Video 1 / SVQ1"), }; |