dilim/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-08-02 22:20:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '802713c4e7b41bc2deed754d78649945c3442063'

Browse Source 
* commit '802713c4e7b41bc2deed754d78649945c3442063':
  mss2: prevent potential uninitialized reads
  mss2: reindent after last commit
  mss2: fix handling of unmasked implicit WMV9 rectangles
  configure: add lavu dependency to lavr/lavfi .pc files
  x86inc: Set program_name outside of x86inc.asm

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2012-11-12 10:57:06 +01:00
parent 3a04c18d89 802713c4e7
commit da501ea857
4 changed files with 46 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavutil/x86/x86inc.asm
View File

@@ -35,7 +35,7 @@
; to x264-devel@videolan.org .
%ifndef program_name
%define program_name ff
%define program_name x264
%endif
%define WIN64 0

1
libavutil/x86/x86util.asm
View File

@@ -23,6 +23,7 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;******************************************************************************
%define program_name ff
%define cpuflags_mmxext cpuflags_mmx2
%include "libavutil/x86/x86inc.asm"