Merge remote-tracking branch 'newdev/master'

* newdev/master:
  mpegts: propagate avio EOF in read_packet()
  configure: Initial support for --target-os=symbian
  Fixed-point FFT and MDCT
  Include dependencies for test programs
  ac3enc: simplify sym_quant()
  flvdec: read index stored in the 'keyframes' tag.
  mov: Add support for zero-sized stsc runs.

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

diff --cc common.mak
Simple merge

diff --cc configure
Simple merge

diff --cc libavcodec/Makefile
Simple merge

diff --cc libavcodec/ac3enc.c
Simple merge

diff --cc libavcodec/costablegen.c
Simple merge

diff --cc libavcodec/fft-internal.h
index 0000000,1f240db..ae76eaf
mode 000000,100644..100644
--- /dev/null
--- 2/libavcodec/fft-internal.h
+++ b/libavcodec/fft-internal.h
@@@ -1,0 -1,67 +1,67 @@@
 - * This file is part of Libav.
+ /*
 - * Libav is free software; you can redistribute it and/or
++ * This file is part of FFmpeg.
+  *
 - * Libav is distributed in the hope that it will be useful,
++ * 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.
+  *
 - * License along with Libav; if not, write to the Free Software
++ * FFmpeg is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
++ * License along with FFmpeg; if not, write to the Free Software
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
+ #ifndef AVCODEC_FFT_INTERNAL_H
+ #define AVCODEC_FFT_INTERNAL_H
+ 
+ #if CONFIG_FFT_FLOAT
+ 
+ #define FIX15(v) (v)
+ #define sqrthalf (float)M_SQRT1_2
+ 
+ #define BF(x, y, a, b) do {                     \
+         x = a - b;                              \
+         y = a + b;                              \
+     } while (0)
+ 
+ #define CMUL(dre, dim, are, aim, bre, bim) do { \
+         (dre) = (are) * (bre) - (aim) * (bim);  \
+         (dim) = (are) * (bim) + (aim) * (bre);  \
+     } while (0)
+ 
+ #else
+ 
+ #include "libavutil/intmath.h"
+ #include "mathops.h"
+ 
+ #define SCALE_FLOAT(a, bits) lrint((a) * (double)(1 << (bits)))
+ #define FIX15(a) av_clip(SCALE_FLOAT(a, 15), -32767, 32767)
+ 
+ #define sqrthalf ((int16_t)((1<<15)*M_SQRT1_2))
+ 
+ #define BF(x, y, a, b) do {                     \
+         x = (a - b) >> 1;                       \
+         y = (a + b) >> 1;                       \
+     } while (0)
+ 
+ #define CMUL(dre, dim, are, aim, bre, bim) do {                 \
+         (dre) = (MUL16(are, bre) - MUL16(aim, bim)) >> 15;      \
+         (dim) = (MUL16(are, bim) + MUL16(aim, bre)) >> 15;      \
+     } while (0)
+ 
+ #endif /* CONFIG_FFT_FLOAT */
+ 
+ #define ff_imdct_calc_c FFT_NAME(ff_imdct_calc_c)
+ #define ff_imdct_half_c FFT_NAME(ff_imdct_half_c)
+ #define ff_mdct_calc_c  FFT_NAME(ff_mdct_calc_c)
+ 
+ void ff_imdct_calc_c(FFTContext *s, FFTSample *output, const FFTSample *input);
+ void ff_imdct_half_c(FFTContext *s, FFTSample *output, const FFTSample *input);
+ void ff_mdct_calc_c(FFTContext *s, FFTSample *output, const FFTSample *input);
+ 
+ #endif /* AVCODEC_FFT_INTERNAL_H */

diff --cc libavcodec/fft.c
Simple merge

diff --cc libavcodec/fft.h
Simple merge

diff --cc libavcodec/fft_fixed.c
index 0000000,b28091d..3955efe
mode 000000,100644..100644
--- /dev/null
--- 2/libavcodec/fft_fixed.c
+++ b/libavcodec/fft_fixed.c
@@@ -1,0 -1,20 +1,20 @@@
 - * This file is part of Libav.
+ /*
 - * Libav is free software; you can redistribute it and/or
++ * This file is part of FFmpeg.
+  *
 - * Libav is distributed in the hope that it will be useful,
++ * 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.
+  *
 - * License along with Libav; if not, write to the Free Software
++ * FFmpeg is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
++ * License along with FFmpeg; if not, write to the Free Software
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
+ #define CONFIG_FFT_FLOAT 0
+ #include "fft.c"

diff --cc libavcodec/fft_float.c
index 0000000,24c9fdb..2149646
mode 000000,100644..100644
--- /dev/null
--- 2/libavcodec/fft_float.c
+++ b/libavcodec/fft_float.c
@@@ -1,0 -1,20 +1,20 @@@
 - * This file is part of Libav.
+ /*
 - * Libav is free software; you can redistribute it and/or
++ * This file is part of FFmpeg.
+  *
 - * Libav is distributed in the hope that it will be useful,
++ * 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.
+  *
 - * License along with Libav; if not, write to the Free Software
++ * FFmpeg is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
++ * License along with FFmpeg; if not, write to the Free Software
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
+ #define CONFIG_FFT_FLOAT 1
+ #include "fft.c"

diff --cc libavcodec/mdct.c
Simple merge

diff --cc libavcodec/mdct_fixed.c
index 0000000,19c8039..5e5819e
mode 000000,100644..100644
--- /dev/null
--- 2/libavcodec/mdct_fixed.c
+++ b/libavcodec/mdct_fixed.c
@@@ -1,0 -1,20 +1,20 @@@
 - * This file is part of Libav.
+ /*
 - * Libav is free software; you can redistribute it and/or
++ * This file is part of FFmpeg.
+  *
 - * Libav is distributed in the hope that it will be useful,
++ * 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.
+  *
 - * License along with Libav; if not, write to the Free Software
++ * FFmpeg is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
++ * License along with FFmpeg; if not, write to the Free Software
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
+ #define CONFIG_FFT_FLOAT 0
+ #include "mdct.c"

diff --cc libavcodec/mdct_float.c
index 0000000,e4f5549..ec4f486
mode 000000,100644..100644
--- /dev/null
--- 2/libavcodec/mdct_float.c
+++ b/libavcodec/mdct_float.c
@@@ -1,0 -1,20 +1,20 @@@
 - * This file is part of Libav.
+ /*
 - * Libav is free software; you can redistribute it and/or
++ * This file is part of FFmpeg.
+  *
 - * Libav is distributed in the hope that it will be useful,
++ * 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.
+  *
 - * License along with Libav; if not, write to the Free Software
++ * FFmpeg is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
++ * License along with FFmpeg; if not, write to the Free Software
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
+ #define CONFIG_FFT_FLOAT 1
+ #include "mdct.c"

diff --cc libavformat/flvdec.c
Simple merge

diff --cc libavformat/mov.c
Simple merge

diff --cc libavformat/mpegts.c
Simple merge