diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-16 01:32:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-16 01:32:52 +0200 |
| commit | fbe02459dc4f3c8f4d758c1a90ed8e35a800f3b9 (patch) | |
| tree | 66263011ff0784ce9a33b697a117516de48401fa /libavcodec/vc1dec.c | |
| parent | 9a1963fbb872f08222a5b73fe96931708ca32732 (diff) | |
| parent | b4675d0fbf6606ab737e81c3c0fe6a05c8764334 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: Check for CommandLineToArgvW
vc1dec: Do not use random pred_flag if motion vector data is skipped
vp8: Enclose pthread function calls in ifdefs
snow: refactor code to work around a compiler bug in MSVC.
vp8: Include the thread headers before using the pthread types
configure: Check for getaddrinfo in ws2tcpip.h, too
vp8: implement sliced threading
vp8: move data from VP8Context->VP8Macroblock
vp8: refactor decoding a single mb_row
doc: update api changes with the right commit hashes
mem: introduce av_malloc_array and av_mallocz_array
Conflicts:
configure
doc/APIchanges
libavcodec/vp8.c
libavutil/mem.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vc1dec.c')
| -rw-r--r-- | libavcodec/vc1dec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 4b6dcf295e..a0a97ebff7 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -3956,7 +3956,7 @@ static int vc1_decode_p_mb_intfi(VC1Context *v) s->current_picture.f.mb_type[mb_pos + v->mb_off] = MB_TYPE_16x16; for (i = 0; i < 6; i++) v->mb_type[0][s->block_index[i]] = 0; if (idx_mbmode <= 5) { // 1-MV - dmv_x = dmv_y = 0; + dmv_x = dmv_y = pred_flag = 0; if (idx_mbmode & 1) { get_mvdata_interlaced(v, &dmv_x, &dmv_y, &pred_flag); } |