diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-07 20:29:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-07 20:29:43 +0200 |
| commit | 3245c8b669018c43ad4bc18cb1720cb757526b85 (patch) | |
| tree | a0d97815a1c6911452e3660fc494364a7146afa7 | |
| parent | e14052dbc8b2f6f0aef99326985e5331cfc98e08 (diff) | |
| parent | fdaad6354fbf1925c9bfeadd32950c503c1103ad (diff) | |
| download | ffmpeg-3245c8b669018c43ad4bc18cb1720cb757526b85.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mxfdec: replace x>>av_log2(sizeof(..)) by x/sizeof(..).
x86: h264_intrapred: Don't add the 'd' suffix to the SPLATB_REG macro
Conflicts:
libavformat/mxfdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/x86/h264_intrapred.asm | 2 | ||||
| -rw-r--r-- | libavformat/mxfdec.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/x86/h264_intrapred.asm b/libavcodec/x86/h264_intrapred.asm index fcfc8060da..fd78456294 100644 --- a/libavcodec/x86/h264_intrapred.asm +++ b/libavcodec/x86/h264_intrapred.asm @@ -156,7 +156,7 @@ cglobal pred16x16_dc, 2,7 %if cpuflag(ssse3) pxor m1, m1 %endif - SPLATB_REG m0, r2d, m1 + SPLATB_REG m0, r2, m1 %if mmsize==8 mov r3d, 8 diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 5cf9709a10..3e79265e3f 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -730,6 +730,7 @@ static int mxf_read_index_entry_array(AVIOContext *pb, MXFIndexTableSegment *seg int i, length; segment->nb_index_entries = avio_rb32(pb); + length = avio_rb32(pb); if (!(segment->temporal_offset_entries=av_calloc(segment->nb_index_entries, sizeof(*segment->temporal_offset_entries))) || |