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>

diff --cc libavcodec/arm/ac3dsp_armv6.S
Simple merge

diff --cc libavcodec/arm/vp8_armv6.S
Simple merge

diff --cc libavcodec/x86/ac3dsp.asm
index 8b7e826,18f9dc3..b67f893
--- 1/libavcodec/x86/ac3dsp.asm
--- 2/libavcodec/x86/ac3dsp.asm
+++ b/libavcodec/x86/ac3dsp.asm
@@@ -15,8 -15,8 +15,8 @@@
  ;* Lesser General Public License for more details.
  ;*
  ;* 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 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"

diff --cc libavcodec/x86/deinterlace.asm
index 76a096e,8613485..2997787
--- 1/libavcodec/x86/deinterlace.asm
--- 2/libavcodec/x86/deinterlace.asm
+++ b/libavcodec/x86/deinterlace.asm
@@@ -16,8 -16,8 +16,8 @@@
  ;* Lesser General Public License for more details.
  ;*
  ;* 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 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"

diff --cc libavcodec/x86/dsputil_yasm.asm
index 4658e5e,15f626e..a41640b
--- 1/libavcodec/x86/dsputil_yasm.asm
--- 2/libavcodec/x86/dsputil_yasm.asm
+++ b/libavcodec/x86/dsputil_yasm.asm
@@@ -15,8 -15,8 +15,8 @@@
  ;* Lesser General Public License for more details.
  ;*
  ;* 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 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"

diff --cc libavcodec/x86/dsputilenc_yasm.asm
index b2844a5,fdd80e8..a4f2d0c
--- 1/libavcodec/x86/dsputilenc_yasm.asm
--- 2/libavcodec/x86/dsputilenc_yasm.asm
+++ b/libavcodec/x86/dsputilenc_yasm.asm
@@@ -17,8 -17,8 +17,8 @@@
  ;* Lesser General Public License for more details.
  ;*
  ;* 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 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"

diff --cc libavcodec/x86/fft_mmx.asm
index b923f1f,fc5cb98..02b638f
--- 1/libavcodec/x86/fft_mmx.asm
--- 2/libavcodec/x86/fft_mmx.asm
+++ b/libavcodec/x86/fft_mmx.asm
@@@ -19,8 -19,8 +19,8 @@@
  ;* Lesser General Public License for more details.
  ;*
  ;* 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 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.

diff --cc libavcodec/x86/fmtconvert.asm
index 6c744fc,5cd8f6c..dc038dd
--- 1/libavcodec/x86/fmtconvert.asm
--- 2/libavcodec/x86/fmtconvert.asm
+++ b/libavcodec/x86/fmtconvert.asm
@@@ -15,8 -15,8 +15,8 @@@
  ;* Lesser General Public License for more details.
  ;*
  ;* 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 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"

diff --cc libavcodec/x86/h264_chromamc.asm
index 3bb5ed4,0a37994..5dae1cc
--- 1/libavcodec/x86/h264_chromamc.asm
--- 2/libavcodec/x86/h264_chromamc.asm
+++ b/libavcodec/x86/h264_chromamc.asm
@@@ -16,8 -16,8 +16,8 @@@
  ;* Lesser General Public License for more details.
  ;*
  ;* 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 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"

diff --cc libavcodec/x86/h264_deblock.asm
index dbf3daa,9831ca2..2a6da0f
--- 1/libavcodec/x86/h264_deblock.asm
--- 2/libavcodec/x86/h264_deblock.asm
+++ b/libavcodec/x86/h264_deblock.asm
@@@ -20,8 -20,8 +20,8 @@@
  ;* Lesser General Public License for more details.
  ;*
  ;* 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 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"

diff --cc libavcodec/x86/h264_idct.asm
index fdb3500,d237b3e..e90b0b1
--- 1/libavcodec/x86/h264_idct.asm
--- 2/libavcodec/x86/h264_idct.asm
+++ b/libavcodec/x86/h264_idct.asm
@@@ -22,8 -22,8 +22,8 @@@
  ;* Lesser General Public License for more details.
  ;*
  ;* 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 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"

diff --cc libavcodec/x86/h264_intrapred.asm
index 28c2f39,0b2f8d3..191eb8d
--- 1/libavcodec/x86/h264_intrapred.asm
--- 2/libavcodec/x86/h264_intrapred.asm
+++ b/libavcodec/x86/h264_intrapred.asm
@@@ -18,8 -18,8 +18,8 @@@
  ;* Lesser General Public License for more details.
  ;*
  ;* 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 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"

diff --cc libavcodec/x86/h264_weight.asm
index 53aa210,d80ca32..87544ae
--- 1/libavcodec/x86/h264_weight.asm
--- 2/libavcodec/x86/h264_weight.asm
+++ b/libavcodec/x86/h264_weight.asm
@@@ -17,8 -17,8 +17,8 @@@
  ;* Lesser General Public License for more details.
  ;*
  ;* 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 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"

diff --cc libavcodec/x86/vc1dsp_yasm.asm
index 3ea9d8d,220cc03..a353c5f
--- 1/libavcodec/x86/vc1dsp_yasm.asm
--- 2/libavcodec/x86/vc1dsp_yasm.asm
+++ b/libavcodec/x86/vc1dsp_yasm.asm
@@@ -15,8 -15,8 +15,8 @@@
  ;* Lesser General Public License for more details.
  ;*
  ;* 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 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"

diff --cc libavcodec/x86/vp3dsp.asm
index f2b0af3,2357438..328f94c
--- 1/libavcodec/x86/vp3dsp.asm
--- 2/libavcodec/x86/vp3dsp.asm
+++ b/libavcodec/x86/vp3dsp.asm
@@@ -15,8 -15,8 +15,8 @@@
  ;* Lesser General Public License for more details.
  ;*
  ;* 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 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"

diff --cc libavcodec/x86/vp56dsp.asm
index 0543ba0,c70ed60..6da3ce3
--- 1/libavcodec/x86/vp56dsp.asm
--- 2/libavcodec/x86/vp56dsp.asm
+++ b/libavcodec/x86/vp56dsp.asm
@@@ -16,8 -16,8 +16,8 @@@
  ;* Lesser General Public License for more details.
  ;*
  ;* 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 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"

diff --cc libavcodec/x86/vp8dsp.asm
index bc5ccc8,e974f12..9b175c1
--- 1/libavcodec/x86/vp8dsp.asm
--- 2/libavcodec/x86/vp8dsp.asm
+++ b/libavcodec/x86/vp8dsp.asm
@@@ -16,8 -16,8 +16,8 @@@
  ;* Lesser General Public License for more details.
  ;*
  ;* 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 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"

diff --cc libavcodec/x86/x86util.asm
index a96b065,8c3fc87..7e5b674
--- 1/libavcodec/x86/x86util.asm
--- 2/libavcodec/x86/x86util.asm
+++ b/libavcodec/x86/x86util.asm
@@@ -19,8 -19,8 +19,8 @@@
  ;* Lesser General Public License for more details.
  ;*
  ;* 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 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