diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-15 04:40:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-15 04:44:07 +0200 |
| commit | 5a153604c930792aa7f00c55cbf3c470f582dfb7 (patch) | |
| tree | 607cdb67b5669c6f317d86f16ff8f3ea7ed6e7ae /libavcodec/x86/h264_weight.asm | |
| parent | 2c4ad1a37b7980b40d6875daea4f87b154509c2e (diff) | |
| parent | 888fa31ecafa75cef3c154e129c45060eea88bd7 (diff) | |
| download | ffmpeg-5a153604c930792aa7f00c55cbf3c470f582dfb7.tar.gz | |
Merge remote branch 'qatar/master'
* 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>
Diffstat (limited to 'libavcodec/x86/h264_weight.asm')
| -rw-r--r-- | libavcodec/x86/h264_weight.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/x86/h264_weight.asm b/libavcodec/x86/h264_weight.asm index 53aa210473..87544ae288 100644 --- a/libavcodec/x86/h264_weight.asm +++ b/libavcodec/x86/h264_weight.asm @@ -18,7 +18,7 @@ ;* ;* You should have received a copy of the GNU Lesser General Public ;* 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" |