Merge remote-tracking branch 'qatar/master'

* qatar/master:
  qdm2: Use floating point synthesis filter.
  h264: correct border check.
  h264: fix loopfilter with threading at slice boundaries.
  Fix ff_mpa_synth_filter_fixed() prototype
  Rename costablegen.c ---> cos_tablegen.c.
  Collapse tableprint.c into tableprint.h.
  Simplify trig table rules
  Remove potentially unstable filenames from comments in generated files.
  Ignore generated tables and generated table generator programs.
  Simplify CLEANFILES make variable by using wildcards.
  Remove silly insults from avformat_version() Doxygen documentation.
  mpegaudiodsp: fix x86 and ppc makefiles
  configure: Adjust AVX assembler check.
  mpegaudio: remove unused version of SAME_HEADER_MASK
  mpegaudio: remove useless #undef at end of file
  asfdec: add missing #include for av_bswap32()
  mpegaudio: merge two #if CONFIG_FLOAT blocks
  mpegaudio: move some struct definitions from mpegaudio.h
  Move some mpegaudio functions to new mpegaudiodsp subsystem

Conflicts:
	libavcodec/h264.c
	libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc .gitignore
index eac1758,8887980..3e8ed00
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -16,8 -15,10 +16,11 @@@ ffmpe
  ffplay
  ffprobe
  ffserver
+ libavcodec/*_tablegen
+ libavcodec/*_tables.c
+ libavcodec/*_tables.h
  libavcodec/libavcodec*
 +libavcore/libavcore*
  libavdevice/libavdevice*
  libavfilter/libavfilter*
  libavformat/libavformat*

diff --cc configure
Simple merge

diff --cc libavcodec/Makefile
Simple merge

diff --cc libavcodec/cos_tablegen.c
Simple merge

diff --cc libavcodec/h264.c
index ae3d263,5fb303c..3068db8
--- 1/libavcodec/h264.c
--- 2/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@@ -2719,9 -2681,9 +2719,9 @@@ static int decode_slice(struct AVCodecC
              }
  
              if( ++s->mb_x >= s->mb_width ) {
-                 loop_filter(h);
-                 s->mb_x = 0;
+                 loop_filter(h, lf_x_start, s->mb_x);
+                 s->mb_x = lf_x_start = 0;
 -                ff_draw_horiz_band(s, 16*s->mb_y, 16);
 +                decode_finish_row(h);
                  ++s->mb_y;
                  if(FIELD_OR_MBAFF_PICTURE) {
                      ++s->mb_y;
@@@ -2761,9 -2721,9 +2759,9 @@@
              }
  
              if(++s->mb_x >= s->mb_width){
-                 loop_filter(h);
-                 s->mb_x=0;
+                 loop_filter(h, lf_x_start, s->mb_x);
+                 s->mb_x = lf_x_start = 0;
 -                ff_draw_horiz_band(s, 16*s->mb_y, 16);
 +                decode_finish_row(h);
                  ++s->mb_y;
                  if(FIELD_OR_MBAFF_PICTURE) {
                      ++s->mb_y;

diff --cc libavcodec/mpc.c
Simple merge

diff --cc libavcodec/mpc.h
Simple merge

diff --cc libavcodec/mpc7.c
Simple merge

diff --cc libavcodec/mpc8.c
Simple merge

diff --cc libavcodec/mpegaudio.h
Simple merge

diff --cc libavcodec/mpegaudio_parser.c
Simple merge

diff --cc libavcodec/mpegaudiodec.c
Simple merge

diff --cc libavcodec/mpegaudiodec_float.c
Simple merge

diff --cc libavcodec/mpegaudiodectab.h
Simple merge

diff --cc libavcodec/mpegaudiodsp.c
index 52f6ac2,57fe962..064acd1
--- 1/libavcodec/tableprint.c
--- 2/libavcodec/mpegaudiodsp.c
+++ b/libavcodec/mpegaudiodsp.c
@@@ -1,11 -1,9 +1,9 @@@
  /*
-  * Generate a file for hardcoded tables
-  *
-  * Copyright (c) 2009 Reimar Döffinger <Reimar.Doeffinger@gmx.de>
+  * Copyright (c) 2011 Mans Rullgard
   *
 - * This file is part of Libav.
 + * This file is part of FFmpeg.
   *
 - * Libav is free software; you can redistribute it and/or
 + * FFmpeg is free software; you can redistribute it and/or
   * modify it under the terms of the GNU Lesser General Public
   * License as published by the Free Software Foundation; either
   * version 2.1 of the License, or (at your option) any later version.

diff --cc libavcodec/mpegaudioenc.c
Simple merge

diff --cc libavcodec/ppc/mpegaudiodec_altivec.c
Simple merge

diff --cc libavcodec/qdm2.c
Simple merge

diff --cc libavcodec/tableprint.h
Simple merge

diff --cc libavcodec/x86/Makefile
index 4775853,5f42850..578ce04
--- 1/libavcodec/x86/Makefile
--- 2/libavcodec/x86/Makefile
+++ b/libavcodec/x86/Makefile
@@@ -21,12 -21,7 +21,8 @@@ YASM-OBJS-$(CONFIG_VC1_DECODER)        
  MMX-OBJS-$(CONFIG_AC3DSP)              += x86/ac3dsp_mmx.o
  YASM-OBJS-$(CONFIG_AC3DSP)             += x86/ac3dsp.o
  MMX-OBJS-$(CONFIG_CAVS_DECODER)        += x86/cavsdsp_mmx.o
- MMX-OBJS-$(CONFIG_MP1FLOAT_DECODER)    += x86/mpegaudiodec_mmx.o
- MMX-OBJS-$(CONFIG_MP2FLOAT_DECODER)    += x86/mpegaudiodec_mmx.o
- MMX-OBJS-$(CONFIG_MP3FLOAT_DECODER)    += x86/mpegaudiodec_mmx.o
- MMX-OBJS-$(CONFIG_MP3ON4FLOAT_DECODER) += x86/mpegaudiodec_mmx.o
- MMX-OBJS-$(CONFIG_MP3ADUFLOAT_DECODER) += x86/mpegaudiodec_mmx.o
+ MMX-OBJS-$(CONFIG_MPEGAUDIODSP)        += x86/mpegaudiodec_mmx.o
 +MMX-OBJS-$(CONFIG_PNG_DECODER)         += x86/png_mmx.o
  MMX-OBJS-$(CONFIG_ENCODERS)            += x86/dsputilenc_mmx.o
  YASM-OBJS-$(CONFIG_ENCODERS)           += x86/dsputilenc_yasm.o
  MMX-OBJS-$(CONFIG_GPL)                 += x86/idct_mmx.o

diff --cc libavcodec/x86/mpegaudiodec_mmx.c
Simple merge

diff --cc libavformat/asfdec.c
Simple merge

diff --cc libavformat/avformat.h
Simple merge