diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-11 13:58:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-11 14:03:12 +0200 |
| commit | de31814ab07fd971d24c66a5e1ecf464b7ebe033 (patch) | |
| tree | 42c68ea4d18cdfbac8051772d9853ac7d50b2f7b /libavcodec/vc1dec.c | |
| parent | c4aaff8c02cecfe42b730cb922521e4b9f26df30 (diff) | |
| parent | b522000e9b2ca36fe5b2751096b9a5f5ed8f87e6 (diff) | |
| download | ffmpeg-streaming-de31814ab07fd971d24c66a5e1ecf464b7ebe033.zip ffmpeg-streaming-de31814ab07fd971d24c66a5e1ecf464b7ebe033.tar.gz | |
Merge commit 'b522000e9b2ca36fe5b2751096b9a5f5ed8f87e6'
* commit 'b522000e9b2ca36fe5b2751096b9a5f5ed8f87e6':
avio: introduce avio_closep
mpegtsenc: set muxing type notification to verbose
vc1dec: Use correct spelling of "opposite"
a64multienc: change mc_frame_counter to unsigned
arm: call arm-specific rv34dsp init functions under if (ARCH_ARM)
svq1: Drop a bunch of useless parentheses
parseutils-test: do not print numerical error codes
svq1: K&R formatting cosmetics
Conflicts:
doc/APIchanges
libavcodec/svq1dec.c
libavcodec/svq1enc.c
libavformat/version.h
libavutil/parseutils.c
tests/ref/fate/parseutils
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vc1dec.c')
| -rw-r--r-- | libavcodec/vc1dec.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 639d317..33ca4bf 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -1351,7 +1351,7 @@ static inline void vc1_pred_mv(VC1Context *v, int n, int dmv_x, int dmv_y, int px, py; int sum; int mixedmv_pic, num_samefield = 0, num_oppfield = 0; - int opposit, a_f, b_f, c_f; + int opposite, a_f, b_f, c_f; int16_t field_predA[2]; int16_t field_predB[2]; int16_t field_predC[2]; @@ -1460,12 +1460,12 @@ static inline void vc1_pred_mv(VC1Context *v, int n, int dmv_x, int dmv_y, if (v->field_mode) { if (num_samefield <= num_oppfield) - opposit = 1 - pred_flag; + opposite = 1 - pred_flag; else - opposit = pred_flag; + opposite = pred_flag; } else - opposit = 0; - if (opposit) { + opposite = 0; + if (opposite) { if (a_valid && !a_f) { field_predA[0] = scaleforopp(v, field_predA[0], 0, dir); field_predA[1] = scaleforopp(v, field_predA[1], 1, dir); |
