diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-11 14:28:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-11 14:28:18 +0200 |
| commit | b6c3487e7f2f8f0d8fae9df023c46ed3112c7443 (patch) | |
| tree | 414b4d0e04e8e7763a36600f9763a8ef8a279510 /libavcodec | |
| parent | de31814ab07fd971d24c66a5e1ecf464b7ebe033 (diff) | |
| parent | 88058d9a994f42e4e9ed4e67baf696bbfe53128c (diff) | |
Merge commit '88058d9a994f42e4e9ed4e67baf696bbfe53128c'
* commit '88058d9a994f42e4e9ed4e67baf696bbfe53128c':
vc1dec: Set chroma reference field from REFFIELD for 1REF field pictures
segment: support applehttp style list
Conflicts:
libavformat/segment.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/vc1dec.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 33ca4bf968..f954a2a13f 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -795,6 +795,7 @@ static void vc1_mc_4mv_chroma(VC1Context *v, int dir) /* calculate chroma MV vector from four luma MVs */ if (!v->field_mode || (v->field_mode && !v->numref)) { valid_count = get_chroma_mv(mvx, mvy, intra, 0, &tx, &ty); + chroma_ref_type = v->reffield; if (!valid_count) { s->current_picture.f.motion_val[1][s->block_index[0] + v->blocks_off][0] = 0; s->current_picture.f.motion_val[1][s->block_index[0] + v->blocks_off][1] = 0; |