virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge remote branch 'qatar/master'

Browse Source 
* qatar/master:
  Fix FSF address copy paste error in some license headers.
  Add an aac sample which uses LTP to fate-aac.
DUPLICATE  [PATCH] Update pixdesc_be fate refs after adding 9/10bit YUV420P formats.
  arm: properly mark external symbol call

Conflicts:
	libavcodec/x86/ac3dsp.asm
	libavcodec/x86/deinterlace.asm
	libavcodec/x86/dsputil_yasm.asm
	libavcodec/x86/dsputilenc_yasm.asm
	libavcodec/x86/fft_mmx.asm
	libavcodec/x86/fmtconvert.asm
	libavcodec/x86/h264_chromamc.asm
	libavcodec/x86/h264_deblock.asm
	libavcodec/x86/h264_idct.asm
	libavcodec/x86/h264_intrapred.asm
	libavcodec/x86/h264_weight.asm
	libavcodec/x86/vc1dsp_yasm.asm
	libavcodec/x86/vp3dsp.asm
	libavcodec/x86/vp56dsp.asm
	libavcodec/x86/vp8dsp.asm
	libavcodec/x86/x86util.asm
	libswscale/ppc/swscale_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-05-15 04:40:50 +02:00
commit 5a153604c9
20 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/arm/ac3dsp_armv6.S
View File

@ -79,5 +79,5 @@ function ff_ac3_bit_alloc_calc_bap_armv6, export=1
ldr r0, [sp, #12] ldr r0, [sp, #12]
mov r1, #0 mov r1, #0
mov r2, #256 mov r2, #256
b memset b X(memset)
endfunc endfunc

2
libavcodec/arm/vp8_armv6.S
View File

@ -180,7 +180,7 @@ function ff_decode_block_coeffs_armv6, export=1
rac_get_prob r5, r6, r7, r8, r0, r9, r10 rac_get_prob r5, r6, r7, r8, r0, r9, r10
mov r9, #8 mov r9, #8
addge r12, r12, #1 addge r12, r12, #1
movrel r4, ff_vp8_dct_cat_prob movrel r4, X(ff_vp8_dct_cat_prob)
lsl r9, r9, r12 lsl r9, r9, r12
ldr r4, [r4, r12, lsl #2] ldr r4, [r4, r12, lsl #2]
add r12, r9, #3 add r12, r9, #3

2
libavcodec/x86/ac3dsp.asm
View File

@ -16,7 +16,7 @@
;* ;*
;* You should have received a copy of the GNU Lesser General Public ;* You should have received a copy of the GNU Lesser General Public
;* License along with FFmpeg; if not, write to the Free Software ;* License along with FFmpeg; if not, write to the Free Software
;* 51, Inc., Foundation Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;****************************************************************************** ;******************************************************************************
%include "x86inc.asm" %include "x86inc.asm"

2
libavcodec/x86/deinterlace.asm
View File

@ -17,7 +17,7 @@
;* ;*
;* You should have received a copy of the GNU Lesser General Public ;* You should have received a copy of the GNU Lesser General Public
;* License along with FFmpeg; if not, write to the Free Software ;* License along with FFmpeg; if not, write to the Free Software
;* 51, Inc., Foundation Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;****************************************************************************** ;******************************************************************************
%include "x86inc.asm" %include "x86inc.asm"

2
libavcodec/x86/dsputil_yasm.asm
View File

@ -16,7 +16,7 @@
;* ;*
;* You should have received a copy of the GNU Lesser General Public ;* You should have received a copy of the GNU Lesser General Public
;* License along with FFmpeg; if not, write to the Free Software ;* License along with FFmpeg; if not, write to the Free Software
;* 51, Inc., Foundation Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;****************************************************************************** ;******************************************************************************
%include "x86inc.asm" %include "x86inc.asm"

2
libavcodec/x86/dsputilenc_yasm.asm
View File

@ -18,7 +18,7 @@
;* ;*
;* You should have received a copy of the GNU Lesser General Public ;* You should have received a copy of the GNU Lesser General Public
;* License along with FFmpeg; if not, write to the Free Software ;* License along with FFmpeg; if not, write to the Free Software
;* 51, Inc., Foundation Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;***************************************************************************** ;*****************************************************************************
%include "x86inc.asm" %include "x86inc.asm"

2
libavcodec/x86/fft_mmx.asm
View File

@ -20,7 +20,7 @@
;* ;*
;* You should have received a copy of the GNU Lesser General Public ;* You should have received a copy of the GNU Lesser General Public
;* License along with FFmpeg; if not, write to the Free Software ;* License along with FFmpeg; if not, write to the Free Software
;* 51, Inc., Foundation Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;****************************************************************************** ;******************************************************************************
; These functions are not individually interchangeable with the C versions. ; These functions are not individually interchangeable with the C versions.

2
libavcodec/x86/fmtconvert.asm
View File

@ -16,7 +16,7 @@
;* ;*
;* You should have received a copy of the GNU Lesser General Public ;* You should have received a copy of the GNU Lesser General Public
;* License along with FFmpeg; if not, write to the Free Software ;* License along with FFmpeg; if not, write to the Free Software
;* 51, Inc., Foundation Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;****************************************************************************** ;******************************************************************************
%include "x86inc.asm" %include "x86inc.asm"

2
libavcodec/x86/h264_chromamc.asm
View File

@ -17,7 +17,7 @@
;* ;*
;* You should have received a copy of the GNU Lesser General Public ;* You should have received a copy of the GNU Lesser General Public
;* License along with FFmpeg; if not, write to the Free Software ;* License along with FFmpeg; if not, write to the Free Software
;* 51, Inc., Foundation Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;****************************************************************************** ;******************************************************************************
%include "x86inc.asm" %include "x86inc.asm"

2
libavcodec/x86/h264_deblock.asm
View File

@ -21,7 +21,7 @@
;* ;*
;* You should have received a copy of the GNU Lesser General Public ;* You should have received a copy of the GNU Lesser General Public
;* License along with FFmpeg; if not, write to the Free Software ;* License along with FFmpeg; if not, write to the Free Software
;* 51, Inc., Foundation Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;****************************************************************************** ;******************************************************************************
%include "x86inc.asm" %include "x86inc.asm"

2
libavcodec/x86/h264_deblock_10bit.asm
View File

@ -21,7 +21,7 @@
;* ;*
;* You should have received a copy of the GNU Lesser General Public ;* You should have received a copy of the GNU Lesser General Public
;* License along with Libav; if not, write to the Free Software ;* License along with Libav; if not, write to the Free Software
;* 51, Inc., Foundation Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;****************************************************************************** ;******************************************************************************
%include "x86inc.asm" %include "x86inc.asm"

2
libavcodec/x86/h264_idct.asm
View File

@ -23,7 +23,7 @@
;* ;*
;* You should have received a copy of the GNU Lesser General Public ;* You should have received a copy of the GNU Lesser General Public
;* License along with FFmpeg; if not, write to the Free Software ;* License along with FFmpeg; if not, write to the Free Software
;* 51, Inc., Foundation Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;***************************************************************************** ;*****************************************************************************
%include "x86inc.asm" %include "x86inc.asm"

2
libavcodec/x86/h264_intrapred.asm
View File

@ -19,7 +19,7 @@
;* ;*
;* You should have received a copy of the GNU Lesser General Public ;* You should have received a copy of the GNU Lesser General Public
;* License along with FFmpeg; if not, write to the Free Software ;* License along with FFmpeg; if not, write to the Free Software
;* 51, Inc., Foundation Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;****************************************************************************** ;******************************************************************************
%include "x86inc.asm" %include "x86inc.asm"

2
libavcodec/x86/h264_weight.asm
View File

@ -18,7 +18,7 @@
;* ;*
;* You should have received a copy of the GNU Lesser General Public ;* You should have received a copy of the GNU Lesser General Public
;* License along with FFmpeg; if not, write to the Free Software ;* License along with FFmpeg; if not, write to the Free Software
;* 51, Inc., Foundation Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;****************************************************************************** ;******************************************************************************
%include "x86inc.asm" %include "x86inc.asm"

2
libavcodec/x86/vc1dsp_yasm.asm
View File

@ -16,7 +16,7 @@
;* ;*
;* You should have received a copy of the GNU Lesser General Public ;* You should have received a copy of the GNU Lesser General Public
;* License along with FFmpeg; if not, write to the Free Software ;* License along with FFmpeg; if not, write to the Free Software
;* 51, Inc., Foundation Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;****************************************************************************** ;******************************************************************************
%include "x86inc.asm" %include "x86inc.asm"

2
libavcodec/x86/vp3dsp.asm
View File

@ -16,7 +16,7 @@
;* ;*
;* You should have received a copy of the GNU Lesser General Public ;* You should have received a copy of the GNU Lesser General Public
;* License along with FFmpeg; if not, write to the Free Software ;* License along with FFmpeg; if not, write to the Free Software
;* 51, Inc., Foundation Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;****************************************************************************** ;******************************************************************************
%include "x86inc.asm" %include "x86inc.asm"

2
libavcodec/x86/vp56dsp.asm
View File

@ -17,7 +17,7 @@
;* ;*
;* You should have received a copy of the GNU Lesser General Public ;* You should have received a copy of the GNU Lesser General Public
;* License along with FFmpeg; if not, write to the Free Software ;* License along with FFmpeg; if not, write to the Free Software
;* 51, Inc., Foundation Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;****************************************************************************** ;******************************************************************************
%include "x86inc.asm" %include "x86inc.asm"

2
libavcodec/x86/vp8dsp.asm
View File

@ -17,7 +17,7 @@
;* ;*
;* You should have received a copy of the GNU Lesser General Public ;* You should have received a copy of the GNU Lesser General Public
;* License along with FFmpeg; if not, write to the Free Software ;* License along with FFmpeg; if not, write to the Free Software
;* 51, Inc., Foundation Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;****************************************************************************** ;******************************************************************************
%include "x86inc.asm" %include "x86inc.asm"

2
libavcodec/x86/x86util.asm
View File

@ -20,7 +20,7 @@
;* ;*
;* You should have received a copy of the GNU Lesser General Public ;* You should have received a copy of the GNU Lesser General Public
;* License along with FFmpeg; if not, write to the Free Software ;* License along with FFmpeg; if not, write to the Free Software
;* 51, Inc., Foundation Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;****************************************************************************** ;******************************************************************************
%macro SBUTTERFLY 4 %macro SBUTTERFLY 4

4
tests/fate/aac.mak
View File

@ -22,6 +22,10 @@ FATE_AAC += fate-aac-latm_000000001180bc60
fate-aac-latm_000000001180bc60: CMD = pcm -i $(SAMPLES)/aac/latm_000000001180bc60.mpg fate-aac-latm_000000001180bc60: CMD = pcm -i $(SAMPLES)/aac/latm_000000001180bc60.mpg
fate-aac-latm_000000001180bc60: REF = $(SAMPLES)/aac/latm_000000001180bc60.s16 fate-aac-latm_000000001180bc60: REF = $(SAMPLES)/aac/latm_000000001180bc60.s16
FATE_AAC += fate-aac-ap05_48
fate-aac-ap05_48: CMD = pcm -i $(SAMPLES)/aac/ap05_48.mp4
fate-aac-ap05_48: REF = $(SAMPLES)/aac/ap05_48.s16
FATE_TESTS += $(FATE_AAC) FATE_TESTS += $(FATE_AAC)
fate-aac: $(FATE_AAC) fate-aac: $(FATE_AAC)
$(FATE_AAC): CMP = oneoff $(FATE_AAC): CMP = oneoff