diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-10 20:51:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-10 20:51:51 +0200 |
| commit | b27c7d70d8ea6e589d0838f0d2529b99928b7192 (patch) | |
| tree | 3ec19e69d80a6660230c964e0b37935c2f280412 /libavcodec/mss1.c | |
| parent | e346176de9809afec3724139ee320b613f753062 (diff) | |
| parent | ed219ed36606be307403b46f969a82bf0568865b (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mss1: fix decoding masked regions in interframes
mxfdec: fix off by one error.
mxfdec: only parse next partition pack if parsing forward
mxfdec: let pkt->pts = mxf->current_edit_unit if intra-only
mxfdec: fix frame height vs field height confusion
mxfdec: Add intra_only flag to MXFTrack
mxfdec: fix Avid AirSpeed files being misinterpreted as OP1a
mxfdec: truncate packets that extend past the next edit unit
mxfdec: set pixel format for cdci picture formats
mxfdec: detect uncomp pictures using essence container ul
mxfdec: set track edit rate num/den in expected order
x86/cpu: implement get/set_eflags using intrinsics
x86/cpu: implement support for cpuid through intrinsics
x86/cpu: implement support for xgetbv through intrinsics
lavu: use intrinsics for emms on systems lacking inline asm support
mem: Don't abort on av_malloc(0) in debug mode
Conflicts:
configure
libavformat/mxf.h
libavformat/mxfdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mss1.c')
| -rw-r--r-- | libavcodec/mss1.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mss1.c b/libavcodec/mss1.c index 6299037d01..302a5b84b1 100644 --- a/libavcodec/mss1.c +++ b/libavcodec/mss1.c @@ -499,7 +499,7 @@ static int decode_region_masked(MSS1Context *ctx, ArithCoder *acoder, dst += x + y * stride; mask += x + y * mask_stride; - if (mask[0] != 0xFF) + if (mask[0] == 0xFF) dst[0] = decode_top_left_pixel(acoder, pctx); for (j = 0; j < height; j++) { for (i = 0; i < width; i++) { |