RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-25 08:42:39 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer 2012-07-07 20:29:43 +02:00
commit 3245c8b669
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/x86/h264_intrapred.asm
View File

@ -156,7 +156,7 @@ cglobal pred16x16_dc, 2,7
%if cpuflag(ssse3) %if cpuflag(ssse3)
pxor m1, m1 pxor m1, m1
%endif %endif
SPLATB_REG m0, r2d, m1 SPLATB_REG m0, r2, m1
%if mmsize==8 %if mmsize==8
mov r3d, 8 mov r3d, 8

1
libavformat/mxfdec.c
View File

@ -730,6 +730,7 @@ static int mxf_read_index_entry_array(AVIOContext *pb, MXFIndexTableSegment *seg
int i, length; int i, length;
segment->nb_index_entries = avio_rb32(pb); segment->nb_index_entries = avio_rb32(pb);
length = avio_rb32(pb); length = avio_rb32(pb);
if (!(segment->temporal_offset_entries=av_calloc(segment->nb_index_entries, sizeof(*segment->temporal_offset_entries))) || if (!(segment->temporal_offset_entries=av_calloc(segment->nb_index_entries, sizeof(*segment->temporal_offset_entries))) ||