diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-09 20:30:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-09 20:30:17 +0200 |
| commit | 75f8f702217fdeae9e2868c7ba80c03f9ec0958a (patch) | |
| tree | f18ccb504b4ea2d45407fc35a9cb8f8efb869bb6 /libavcodec/indeo4.c | |
| parent | 8554e21f79a88844c7b192b029c9f6257f8b66f1 (diff) | |
| parent | 30f515091c323da59c0f1b533703dedca2f4b95d (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: allow cropping to AVCodecContext.width/height
mov: set AVCodecContext.width/height for h264
iac: generate codec tables as they are supposed to be
indeo4: handle frame type 1 properly
lavu: change versioning script to include all av* prefixed symbols
Conflicts:
libavcodec/h264.c
libavutil/libavutil.v
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/indeo4.c')
| -rw-r--r-- | libavcodec/indeo4.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libavcodec/indeo4.c b/libavcodec/indeo4.c index 5404866493..117263b829 100644 --- a/libavcodec/indeo4.c +++ b/libavcodec/indeo4.c @@ -40,7 +40,7 @@ */ enum { FRAMETYPE_INTRA = 0, - FRAMETYPE_BIDIR1 = 1, ///< bidirectional frame + FRAMETYPE_INTRA1 = 1, ///< intra frame with slightly different bitstream coding FRAMETYPE_INTER = 2, ///< non-droppable P-frame FRAMETYPE_BIDIR = 3, ///< bidirectional frame FRAMETYPE_INTER_NOREF = 4, ///< droppable P-frame @@ -133,8 +133,7 @@ static int decode_pic_hdr(IVI45DecContext *ctx, AVCodecContext *avctx) } #if IVI4_STREAM_ANALYSER - if ( ctx->frame_type == FRAMETYPE_BIDIR1 - || ctx->frame_type == FRAMETYPE_BIDIR) + if (ctx->frame_type == FRAMETYPE_BIDIR) ctx->has_b_frames = 1; #endif @@ -500,7 +499,8 @@ static int decode_mb_info(IVI45DecContext *ctx, IVIBandDesc *band, } else { if (band->inherit_mv && ref_mb) { mb->type = ref_mb->type; /* copy mb_type from corresponding reference mb */ - } else if (ctx->frame_type == FRAMETYPE_INTRA) { + } else if (ctx->frame_type == FRAMETYPE_INTRA || + ctx->frame_type == FRAMETYPE_INTRA1) { mb->type = 0; /* mb_type is always INTRA for intra-frames */ } else { mb->type = get_bits(&ctx->gb, mb_type_bits); @@ -577,6 +577,7 @@ static void switch_buffers(IVI45DecContext *ctx) { switch (ctx->prev_frame_type) { case FRAMETYPE_INTRA: + case FRAMETYPE_INTRA1: case FRAMETYPE_INTER: ctx->buf_switch ^= 1; ctx->dst_buf = ctx->buf_switch; @@ -588,6 +589,7 @@ static void switch_buffers(IVI45DecContext *ctx) switch (ctx->frame_type) { case FRAMETYPE_INTRA: + case FRAMETYPE_INTRA1: ctx->buf_switch = 0; /* FALLTHROUGH */ case FRAMETYPE_INTER: |