From 5a819c5e23b46bb03a9862790452ff829ea1e898 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Thu, 7 Jul 2011 02:01:07 +0200
Subject: avformat_open_input(): Add braces to shut up gcc warning.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

libavformat/utils.c:599: warning: missing braces around initializer
libavformat/utils.c:599: warning: (near initialization for ‘ap.time_base’)
---
 libavformat/utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index cc0336a670..4b675e66c2 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -597,7 +597,7 @@ int avformat_open_input(AVFormatContext **ps, const char *filename, AVInputForma
 {
     AVFormatContext *s = *ps;
     int ret = 0;
-    AVFormatParameters ap = { 0 };
+    AVFormatParameters ap = { { 0 } };
     AVDictionary *tmp = NULL;
 
     if (!s && !(s = avformat_alloc_context()))
-- 
cgit v1.2.3


From ec679eb4530174fe8d1e06c6010597539f6c1c97 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Thu, 14 Jul 2011 03:12:36 +0200
Subject: doxygen: place empty line between brief description and detailed
 description

Without it, Doxygen cannot separate them into different sections.
---
 libavcodec/8svx.c | 1 +
 libavcodec/qdm2.c | 1 +
 libavcodec/rl2.c  | 1 +
 libavformat/iss.c | 3 ++-
 libavformat/rl2.c | 1 +
 5 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/libavcodec/8svx.c b/libavcodec/8svx.c
index 5fdea915ff..4b60377128 100644
--- a/libavcodec/8svx.c
+++ b/libavcodec/8svx.c
@@ -23,6 +23,7 @@
  * @file
  * 8svx audio decoder
  * @author Jaikrishnan Menon
+ *
  * supports: fibonacci delta encoding
  *         : exponential encoding
  */
diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c
index 86847adc10..2a45495c7c 100644
--- a/libavcodec/qdm2.c
+++ b/libavcodec/qdm2.c
@@ -26,6 +26,7 @@
  * @file
  * QDM2 decoder
  * @author Ewald Snel, Benjamin Larsson, Alex Beregszaszi, Roberto Togni
+ *
  * The decoder is not perfect yet, there are still some distortions
  * especially on files encoded with 16 or 8 subbands.
  */
diff --git a/libavcodec/rl2.c b/libavcodec/rl2.c
index 3d1cea3995..c88e8ed343 100644
--- a/libavcodec/rl2.c
+++ b/libavcodec/rl2.c
@@ -23,6 +23,7 @@
  * RL2 Video Decoder
  * @file
  * @author Sascha Sommer (saschasommer@freenet.de)
+ *
  * For more information about the RL2 format, visit:
  *   http://wiki.multimedia.cx/index.php?title=RL2
  */
diff --git a/libavformat/iss.c b/libavformat/iss.c
index fe5203dbcd..100066bad2 100644
--- a/libavformat/iss.c
+++ b/libavformat/iss.c
@@ -23,7 +23,8 @@
  * @file
  * Funcom ISS file demuxer
  * @author Jaikrishnan Menon
- * for more information on the .iss file format, visit:
+ *
+ * For more information on the .iss file format, visit:
  * http://wiki.multimedia.cx/index.php?title=FunCom_ISS
  */
 
diff --git a/libavformat/rl2.c b/libavformat/rl2.c
index 12cb391ad8..68c1a01636 100644
--- a/libavformat/rl2.c
+++ b/libavformat/rl2.c
@@ -23,6 +23,7 @@
  * RL2 file demuxer
  * @file
  * @author Sascha Sommer (saschasommer@freenet.de)
+ *
  * For more information regarding the RL2 file format, visit:
  *   http://wiki.multimedia.cx/index.php?title=RL2
  *
-- 
cgit v1.2.3


From f6f95d4e4930b087851165d84dec1b45e412e86b Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Thu, 14 Jul 2011 03:46:19 +0200
Subject: doxygen: consistently place brief description

---
 libavcodec/faxcompr.c | 2 +-
 libavcodec/faxcompr.h | 2 +-
 libavcodec/lzwenc.c   | 2 +-
 libavcodec/pcxenc.c   | 2 +-
 libavcodec/rl2.c      | 2 +-
 libavcodec/tiff.c     | 3 ++-
 libavcodec/tiff.h     | 3 ++-
 libavcodec/tiffenc.c  | 3 ++-
 libavcodec/tmv.c      | 2 +-
 libavformat/soxdec.c  | 2 +-
 libavformat/soxenc.c  | 2 +-
 libavformat/tmv.c     | 2 +-
 12 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/libavcodec/faxcompr.c b/libavcodec/faxcompr.c
index 79e8d757af..e59dad676a 100644
--- a/libavcodec/faxcompr.c
+++ b/libavcodec/faxcompr.c
@@ -20,8 +20,8 @@
  */
 
 /**
- * CCITT Fax Group 3 and 4 decompression
  * @file
+ * CCITT Fax Group 3 and 4 decompression
  * @author Konstantin Shishkov
  */
 #include "avcodec.h"
diff --git a/libavcodec/faxcompr.h b/libavcodec/faxcompr.h
index 4742d15e59..8157f1fc21 100644
--- a/libavcodec/faxcompr.h
+++ b/libavcodec/faxcompr.h
@@ -20,8 +20,8 @@
  */
 
 /**
- * CCITT Fax Group 3 and 4 decompression
  * @file
+ * CCITT Fax Group 3 and 4 decompression
  * @author Konstantin Shishkov
  */
 #ifndef AVCODEC_FAXCOMPR_H
diff --git a/libavcodec/lzwenc.c b/libavcodec/lzwenc.c
index df38116c0d..cb064e7936 100644
--- a/libavcodec/lzwenc.c
+++ b/libavcodec/lzwenc.c
@@ -20,8 +20,8 @@
  */
 
 /**
- * LZW encoder
  * @file
+ * LZW encoder
  * @author Bartlomiej Wolowiec
  */
 
diff --git a/libavcodec/pcxenc.c b/libavcodec/pcxenc.c
index 81629d0add..2df84afa38 100644
--- a/libavcodec/pcxenc.c
+++ b/libavcodec/pcxenc.c
@@ -20,8 +20,8 @@
  */
 
 /**
- * PCX image encoder
  * @file
+ * PCX image encoder
  * @author Daniel Verkamp
  * @sa http://www.qzx.com/pc-gpe/pcx.txt
  */
diff --git a/libavcodec/rl2.c b/libavcodec/rl2.c
index c88e8ed343..9d436a682f 100644
--- a/libavcodec/rl2.c
+++ b/libavcodec/rl2.c
@@ -20,8 +20,8 @@
  */
 
 /**
- * RL2 Video Decoder
  * @file
+ * RL2 Video Decoder
  * @author Sascha Sommer (saschasommer@freenet.de)
  *
  * For more information about the RL2 format, visit:
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c
index 08cd3b0a6f..7241d6f3fb 100644
--- a/libavcodec/tiff.c
+++ b/libavcodec/tiff.c
@@ -20,10 +20,11 @@
  */
 
 /**
- * TIFF image decoder
  * @file
+ * TIFF image decoder
  * @author Konstantin Shishkov
  */
+
 #include "avcodec.h"
 #if CONFIG_ZLIB
 #include <zlib.h>
diff --git a/libavcodec/tiff.h b/libavcodec/tiff.h
index cd7ec830e7..cf890d678b 100644
--- a/libavcodec/tiff.h
+++ b/libavcodec/tiff.h
@@ -20,10 +20,11 @@
  */
 
 /**
- * TIFF tables
  * @file
+ * TIFF tables
  * @author Konstantin Shishkov
  */
+
 #ifndef AVCODEC_TIFF_H
 #define AVCODEC_TIFF_H
 
diff --git a/libavcodec/tiffenc.c b/libavcodec/tiffenc.c
index 5cff13bca0..3d927eb068 100644
--- a/libavcodec/tiffenc.c
+++ b/libavcodec/tiffenc.c
@@ -20,10 +20,11 @@
  */
 
 /**
- * TIFF image encoder
  * @file
+ * TIFF image encoder
  * @author Bartlomiej Wolowiec
  */
+
 #include "avcodec.h"
 #if CONFIG_ZLIB
 #include <zlib.h>
diff --git a/libavcodec/tmv.c b/libavcodec/tmv.c
index 80f3ac9cbc..d540182ada 100644
--- a/libavcodec/tmv.c
+++ b/libavcodec/tmv.c
@@ -20,8 +20,8 @@
  */
 
 /**
- * 8088flex TMV video decoder
  * @file
+ * 8088flex TMV video decoder
  * @author Daniel Verkamp
  * @sa http://www.oldskool.org/pc/8088_Corruption
  */
diff --git a/libavformat/soxdec.c b/libavformat/soxdec.c
index b3b35b12fd..ca82ef1cca 100644
--- a/libavformat/soxdec.c
+++ b/libavformat/soxdec.c
@@ -23,8 +23,8 @@
  */
 
 /**
- * SoX native format demuxer
  * @file
+ * SoX native format demuxer
  * @author Daniel Verkamp
  * @sa http://wiki.multimedia.cx/index.php?title=SoX_native_intermediate_format
  */
diff --git a/libavformat/soxenc.c b/libavformat/soxenc.c
index a0faa466df..e28c479c97 100644
--- a/libavformat/soxenc.c
+++ b/libavformat/soxenc.c
@@ -23,8 +23,8 @@
  */
 
 /**
- * SoX native format muxer
  * @file
+ * SoX native format muxer
  * @author Daniel Verkamp
  * @sa http://wiki.multimedia.cx/index.php?title=SoX_native_intermediate_format
  */
diff --git a/libavformat/tmv.c b/libavformat/tmv.c
index f894eab46a..79a875885e 100644
--- a/libavformat/tmv.c
+++ b/libavformat/tmv.c
@@ -20,8 +20,8 @@
  */
 
 /**
- * 8088flex TMV file demuxer
  * @file
+ * 8088flex TMV file demuxer
  * @author Daniel Verkamp
  * @sa http://www.oldskool.org/pc/8088_Corruption
  */
-- 
cgit v1.2.3


From a2f31564b4759c02c81f3f4d1be359eb4a18f050 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Thu, 14 Jul 2011 03:54:10 +0200
Subject: doc: remove file name from @file directive in Doxygen usage example

The file name is redundant and brittle across file renamings.
---
 doc/developer.texi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/developer.texi b/doc/developer.texi
index 45a4f4476b..208c119753 100644
--- a/doc/developer.texi
+++ b/doc/developer.texi
@@ -92,7 +92,7 @@ above them explaining what the function does, even if it is just one sentence.
 All structures and their member variables should be documented, too.
 @example
 /**
- * @@file mpeg.c
+ * @@file
  * MPEG codec.
  * @@author ...
  */
-- 
cgit v1.2.3


From 99b9df5281ef5e8f1991cd5edd5d5acb49a35144 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Thu, 14 Jul 2011 04:05:17 +0200
Subject: doxygen: misc consistency cosmetics

---
 libavcodec/g722.c       | 1 -
 libavcodec/lzw.h        | 2 +-
 libavcodec/msmpeg4.h    | 4 ----
 libavcodec/vaapi_h264.c | 7 ++++---
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/libavcodec/g722.c b/libavcodec/g722.c
index 257292de7f..74d5552071 100644
--- a/libavcodec/g722.c
+++ b/libavcodec/g722.c
@@ -26,7 +26,6 @@
 
 /**
  * @file
- *
  * G.722 ADPCM audio codec
  *
  * This G.722 decoder is a bit-exact implementation of the ITU G.722
diff --git a/libavcodec/lzw.h b/libavcodec/lzw.h
index d1efdaf131..c6ae05732c 100644
--- a/libavcodec/lzw.h
+++ b/libavcodec/lzw.h
@@ -24,7 +24,7 @@
  * @file
  * @brief LZW decoding routines
  * @author Fabrice Bellard
- * Modified for use in TIFF by Konstantin Shishkov
+ * modified for use in TIFF by Konstantin Shishkov
  */
 
 #ifndef AVCODEC_LZW_H
diff --git a/libavcodec/msmpeg4.h b/libavcodec/msmpeg4.h
index 8a0a066e48..9247accd48 100644
--- a/libavcodec/msmpeg4.h
+++ b/libavcodec/msmpeg4.h
@@ -19,10 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-/**
- * @file
- */
-
 #ifndef AVCODEC_MSMPEG4_H
 #define AVCODEC_MSMPEG4_H
 
diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c
index f6d1a6d48e..51ebaaf5a0 100644
--- a/libavcodec/vaapi_h264.c
+++ b/libavcodec/vaapi_h264.c
@@ -23,9 +23,10 @@
 #include "vaapi_internal.h"
 #include "h264.h"
 
-/** @file
- *  This file implements the glue code between Libav's and VA API's
- *  structures for H.264 decoding.
+/**
+ * @file
+ * This file implements the glue code between Libav's and VA API's
+ * structures for H.264 decoding.
  */
 
 /**
-- 
cgit v1.2.3


From 55eda370cb6fe9e4c21539f3f90fd940fcf7a103 Mon Sep 17 00:00:00 2001
From: "Ronald S. Bultje" <rsbultje@gmail.com>
Date: Thu, 14 Jul 2011 10:24:40 -0700
Subject: swscale: clip unscaled colorspace conversion path.

Prevents overflows on very bright scenes when adding dither,
which may lead to black dots.
---
 libswscale/swscale_unscaled.c | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c
index e6dac22cfe..59f31c6f64 100644
--- a/libswscale/swscale_unscaled.c
+++ b/libswscale/swscale_unscaled.c
@@ -454,18 +454,20 @@ static int packedCopyWrapper(SwsContext *c, const uint8_t* src[], int srcStride[
     return srcSliceH;
 }
 
-#define DITHER_COPY(dst, dstStride, wfunc, src, srcStride, rfunc, dithers, shift) \
+#define clip9(x)  av_clip_uintp2(x,  9)
+#define clip10(x) av_clip_uintp2(x, 10)
+#define DITHER_COPY(dst, dstStride, wfunc, src, srcStride, rfunc, dithers, shift, clip) \
     for (i = 0; i < height; i++) { \
         const uint8_t *dither = dithers[i & 7]; \
         for (j = 0; j < length - 7; j += 8) { \
-            wfunc(&dst[j + 0], (rfunc(&src[j + 0]) + dither[0]) >> shift); \
-            wfunc(&dst[j + 1], (rfunc(&src[j + 1]) + dither[1]) >> shift); \
-            wfunc(&dst[j + 2], (rfunc(&src[j + 2]) + dither[2]) >> shift); \
-            wfunc(&dst[j + 3], (rfunc(&src[j + 3]) + dither[3]) >> shift); \
-            wfunc(&dst[j + 4], (rfunc(&src[j + 4]) + dither[4]) >> shift); \
-            wfunc(&dst[j + 5], (rfunc(&src[j + 5]) + dither[5]) >> shift); \
-            wfunc(&dst[j + 6], (rfunc(&src[j + 6]) + dither[6]) >> shift); \
-            wfunc(&dst[j + 7], (rfunc(&src[j + 7]) + dither[7]) >> shift); \
+            wfunc(&dst[j + 0], clip((rfunc(&src[j + 0]) + dither[0]) >> shift)); \
+            wfunc(&dst[j + 1], clip((rfunc(&src[j + 1]) + dither[1]) >> shift)); \
+            wfunc(&dst[j + 2], clip((rfunc(&src[j + 2]) + dither[2]) >> shift)); \
+            wfunc(&dst[j + 3], clip((rfunc(&src[j + 3]) + dither[3]) >> shift)); \
+            wfunc(&dst[j + 4], clip((rfunc(&src[j + 4]) + dither[4]) >> shift)); \
+            wfunc(&dst[j + 5], clip((rfunc(&src[j + 5]) + dither[5]) >> shift)); \
+            wfunc(&dst[j + 6], clip((rfunc(&src[j + 6]) + dither[6]) >> shift)); \
+            wfunc(&dst[j + 7], clip((rfunc(&src[j + 7]) + dither[7]) >> shift)); \
         } \
         for (; j < length; j++) \
             wfunc(&dst[j],     (rfunc(&src[j]) + dither[j & 7]) >> shift); \
@@ -538,7 +540,7 @@ static int planarCopyWrapper(SwsContext *c, const uint8_t* src[], int srcStride[
                     } else if (dst_depth < src_depth) { \
                         DITHER_COPY(dstPtr2, dstStride[plane]/2, wfunc, \
                                     srcPtr2, srcStride[plane]/2, rfunc, \
-                                    dither_8x8_1, 1); \
+                                    dither_8x8_1, 1, clip9); \
                     } else { \
                         COPY9_OR_10TO9_OR_10(wfunc(&dstPtr2[j], rfunc(&srcPtr2[j]))); \
                     }
@@ -561,11 +563,11 @@ static int planarCopyWrapper(SwsContext *c, const uint8_t* src[], int srcStride[
                     if (src_depth == 9) { \
                         DITHER_COPY(dstPtr,  dstStride[plane],   W8, \
                                     srcPtr2, srcStride[plane]/2, rfunc, \
-                                    dither_8x8_1, 1); \
+                                    dither_8x8_1, 1, av_clip_uint8); \
                     } else { \
                         DITHER_COPY(dstPtr,  dstStride[plane],   W8, \
                                     srcPtr2, srcStride[plane]/2, rfunc, \
-                                    dither_8x8_3, 2); \
+                                    dither_8x8_3, 2, av_clip_uint8); \
                     }
                     if (isBE(c->srcFormat)) {
                         COPY9_OR_10TO8(AV_RB16);
@@ -583,11 +585,11 @@ static int planarCopyWrapper(SwsContext *c, const uint8_t* src[], int srcStride[
                     if (dst_depth == 9) { \
                         DITHER_COPY(dstPtr2, dstStride[plane]/2, wfunc, \
                                     srcPtr2, srcStride[plane]/2, rfunc, \
-                                    dither_8x8_128, 7); \
+                                    dither_8x8_128, 7, clip9); \
                     } else { \
                         DITHER_COPY(dstPtr2, dstStride[plane]/2, wfunc, \
                                     srcPtr2, srcStride[plane]/2, rfunc, \
-                                    dither_8x8_64, 6); \
+                                    dither_8x8_64, 6, clip10); \
                     }
                     if (isBE(c->dstFormat)) {
                         if (isBE(c->srcFormat)) {
@@ -623,7 +625,7 @@ static int planarCopyWrapper(SwsContext *c, const uint8_t* src[], int srcStride[
 #define COPY16TO8(rfunc) \
                     DITHER_COPY(dstPtr,  dstStride[plane],   W8, \
                                 srcPtr2, srcStride[plane]/2, rfunc, \
-                                dither_8x8_256, 8);
+                                dither_8x8_256, 8, av_clip_uint8);
                 if (isBE(c->srcFormat)) {
                     COPY16TO8(AV_RB16);
                 } else {
-- 
cgit v1.2.3


From baba2eedacbbaecf55bdb89dbfe32c69799df99f Mon Sep 17 00:00:00 2001
From: "Ronald S. Bultje" <rsbultje@gmail.com>
Date: Thu, 14 Jul 2011 10:31:27 -0700
Subject: swscale: extend mmx padding.

Fixes a crash when forcing libc to strictly adhere to malloc sizes.
---
 libswscale/utils.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/libswscale/utils.c b/libswscale/utils.c
index 6647f68682..0bde82026d 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -1049,19 +1049,20 @@ int sws_init_context(SwsContext *c, SwsFilter *srcFilter, SwsFilter *dstFilter)
     //Note we need at least one pixel more at the end because of the MMX code (just in case someone wanna replace the 4000/8000)
     /* align at 16 bytes for AltiVec */
     for (i=0; i<c->vLumBufSize; i++) {
-        FF_ALLOCZ_OR_GOTO(c, c->lumPixBuf[i+c->vLumBufSize], dst_stride+1, fail);
+        FF_ALLOCZ_OR_GOTO(c, c->lumPixBuf[i+c->vLumBufSize], dst_stride+16, fail);
         c->lumPixBuf[i] = c->lumPixBuf[i+c->vLumBufSize];
     }
-    c->uv_off_px   = dst_stride_px;
-    c->uv_off_byte = dst_stride;
+    // 64 / c->scalingBpp is the same as 16 / sizeof(scaling_intermediate)
+    c->uv_off_px   = dst_stride_px + 64 / c->scalingBpp;
+    c->uv_off_byte = dst_stride + 16;
     for (i=0; i<c->vChrBufSize; i++) {
-        FF_ALLOC_OR_GOTO(c, c->chrUPixBuf[i+c->vChrBufSize], dst_stride*2+1, fail);
+        FF_ALLOC_OR_GOTO(c, c->chrUPixBuf[i+c->vChrBufSize], dst_stride*2+32, fail);
         c->chrUPixBuf[i] = c->chrUPixBuf[i+c->vChrBufSize];
-        c->chrVPixBuf[i] = c->chrVPixBuf[i+c->vChrBufSize] = c->chrUPixBuf[i] + (dst_stride >> 1);
+        c->chrVPixBuf[i] = c->chrVPixBuf[i+c->vChrBufSize] = c->chrUPixBuf[i] + (dst_stride >> 1) + 8;
     }
     if (CONFIG_SWSCALE_ALPHA && c->alpPixBuf)
         for (i=0; i<c->vLumBufSize; i++) {
-            FF_ALLOCZ_OR_GOTO(c, c->alpPixBuf[i+c->vLumBufSize], dst_stride+1, fail);
+            FF_ALLOCZ_OR_GOTO(c, c->alpPixBuf[i+c->vLumBufSize], dst_stride+16, fail);
             c->alpPixBuf[i] = c->alpPixBuf[i+c->vLumBufSize];
         }
 
-- 
cgit v1.2.3


From daca33659d12fd85062bc1798f4eb7ffeb83cc3c Mon Sep 17 00:00:00 2001
From: Martin Storsjö <martin@martin.st>
Date: Thu, 14 Jul 2011 23:01:29 +0300
Subject: ffmpeg: Fix the check for experimental codecs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The variable 'codec' was used uninitialized here.

Signed-off-by: Martin Storsjö <martin@martin.st>
---
 ffmpeg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index dcc92ac481..cbbd3e7b1e 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -522,7 +522,7 @@ static void assert_codec_experimental(AVCodecContext *c, int encoder)
         av_log(NULL, AV_LOG_ERROR, "%s '%s' is experimental and might produce bad "
                 "results.\nAdd '-strict experimental' if you want to use it.\n",
                 codec_string, c->codec->name);
-        codec = encoder ? avcodec_find_encoder(codec->id) : avcodec_find_decoder(codec->id);
+        codec = encoder ? avcodec_find_encoder(c->codec->id) : avcodec_find_decoder(c->codec->id);
         if (!(codec->capabilities & CODEC_CAP_EXPERIMENTAL))
             av_log(NULL, AV_LOG_ERROR, "Or use the non experimental %s '%s'.\n",
                    codec_string, codec->name);
-- 
cgit v1.2.3


From 863e2046fdcdf26493effb6e696d98c9dc23b4a7 Mon Sep 17 00:00:00 2001
From: Mike Williams <mike@mikebwilliams.com>
Date: Wed, 13 Jul 2011 14:24:47 -0400
Subject: ffserver: Replace two loops with one loop.

Signed-off-by: Mike Williams <mike@mikebwilliams.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
---
 ffserver.c | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/ffserver.c b/ffserver.c
index ca4b54f4d4..2cbfe7589e 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -3644,18 +3644,6 @@ static void build_feed_streams(void)
     FFStream *stream, *feed;
     int i;
 
-    /* gather all streams */
-    for(stream = first_stream; stream != NULL; stream = stream->next) {
-        feed = stream->feed;
-        if (feed) {
-            if (!stream->is_feed) {
-                /* we handle a stream coming from a feed */
-                for(i=0;i<stream->nb_streams;i++)
-                    stream->feed_streams[i] = add_av_stream(feed, stream->streams[i]);
-            }
-        }
-    }
-
     /* gather all streams */
     for(stream = first_stream; stream != NULL; stream = stream->next) {
         feed = stream->feed;
@@ -3663,6 +3651,10 @@ static void build_feed_streams(void)
             if (stream->is_feed) {
                 for(i=0;i<stream->nb_streams;i++)
                     stream->feed_streams[i] = i;
+            } else {
+                /* we handle a stream coming from a feed */
+                for(i=0;i<stream->nb_streams;i++)
+                    stream->feed_streams[i] = add_av_stream(feed, stream->streams[i]);
             }
         }
     }
-- 
cgit v1.2.3


From ca5d57ef8ace36ca465208e04aaae1b461cb514a Mon Sep 17 00:00:00 2001
From: Martin Storsjö <martin@martin.st>
Date: Fri, 15 Jul 2011 00:21:15 +0300
Subject: ac3enc: Mark AVClasses const
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Martin Storsjö <martin@martin.st>
---
 libavcodec/ac3enc_fixed.c | 4 ++--
 libavcodec/ac3enc_float.c | 4 ++--
 libavcodec/eac3enc.c      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libavcodec/ac3enc_fixed.c b/libavcodec/ac3enc_fixed.c
index 15c5a4bca7..ed8992ebff 100644
--- a/libavcodec/ac3enc_fixed.c
+++ b/libavcodec/ac3enc_fixed.c
@@ -32,8 +32,8 @@
 
 #define AC3ENC_TYPE AC3ENC_TYPE_AC3_FIXED
 #include "ac3enc_opts_template.c"
-static AVClass ac3enc_class = { "Fixed-Point AC-3 Encoder", av_default_item_name,
-                                ac3fixed_options, LIBAVUTIL_VERSION_INT };
+static const AVClass ac3enc_class = { "Fixed-Point AC-3 Encoder", av_default_item_name,
+                                      ac3fixed_options, LIBAVUTIL_VERSION_INT };
 
 #include "ac3enc_template.c"
 
diff --git a/libavcodec/ac3enc_float.c b/libavcodec/ac3enc_float.c
index deec79ce8f..776d185fa4 100644
--- a/libavcodec/ac3enc_float.c
+++ b/libavcodec/ac3enc_float.c
@@ -35,8 +35,8 @@
 #if CONFIG_AC3_ENCODER
 #define AC3ENC_TYPE AC3ENC_TYPE_AC3
 #include "ac3enc_opts_template.c"
-static AVClass ac3enc_class = { "AC-3 Encoder", av_default_item_name,
-                                ac3_options, LIBAVUTIL_VERSION_INT };
+static const AVClass ac3enc_class = { "AC-3 Encoder", av_default_item_name,
+                                      ac3_options, LIBAVUTIL_VERSION_INT };
 #endif
 
 #include "ac3enc_template.c"
diff --git a/libavcodec/eac3enc.c b/libavcodec/eac3enc.c
index f39b9f1925..0433db49d7 100644
--- a/libavcodec/eac3enc.c
+++ b/libavcodec/eac3enc.c
@@ -31,8 +31,8 @@
 
 #define AC3ENC_TYPE AC3ENC_TYPE_EAC3
 #include "ac3enc_opts_template.c"
-static AVClass eac3enc_class = { "E-AC-3 Encoder", av_default_item_name,
-                                 eac3_options, LIBAVUTIL_VERSION_INT };
+static const AVClass eac3enc_class = { "E-AC-3 Encoder", av_default_item_name,
+                                       eac3_options, LIBAVUTIL_VERSION_INT };
 
 
 void ff_eac3_set_cpl_states(AC3EncodeContext *s)
-- 
cgit v1.2.3


From 6168781f70ebac7da557207750d14f57c3cd4cb3 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Thu, 14 Jul 2011 03:11:19 +0200
Subject: doxygen: do not include license boilerplate in Doxygen documentation

---
 libavcodec/huffman.c   |  9 ++++++---
 libavcodec/huffman.h   |  9 ++++++---
 libavcodec/vorbis.c    | 12 +++++++-----
 libavcodec/vorbisdec.c | 12 +++++++-----
 libavcodec/vp5.c       | 10 ++++++----
 libavcodec/vp56.c      | 10 ++++++----
 libavcodec/vp56.h      | 10 ++++++----
 libavcodec/vp56data.c  | 10 ++++++----
 libavcodec/vp56data.h  | 10 ++++++----
 libavcodec/vp5data.h   | 10 ++++++----
 libavcodec/vp6.c       | 18 ++++++++++--------
 libavcodec/vp6data.h   | 10 ++++++----
 libavcodec/vp6dsp.c    | 10 ++++++----
 libavcodec/vp8data.h   |  9 ++++++---
 libavcodec/vp8dsp.c    |  9 ++++++---
 libavcodec/vp8dsp.h    |  8 +++++---
 libavcodec/yop.c       |  3 +--
 libavformat/flv.h      |  8 ++++++--
 libavformat/yop.c      |  3 +--
 libavutil/timer.h      | 10 ++++++----
 20 files changed, 115 insertions(+), 75 deletions(-)

diff --git a/libavcodec/huffman.c b/libavcodec/huffman.c
index 211ea63750..4fb6530d39 100644
--- a/libavcodec/huffman.c
+++ b/libavcodec/huffman.c
@@ -1,6 +1,4 @@
-/**
- * @file
- * huffman tree builder and VLC generator
+/*
  * Copyright (c) 2006 Konstantin Shishkov
  *
  * This file is part of Libav.
@@ -20,6 +18,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+/**
+ * @file
+ * huffman tree builder and VLC generator
+ */
+
 #include "avcodec.h"
 #include "get_bits.h"
 #include "huffman.h"
diff --git a/libavcodec/huffman.h b/libavcodec/huffman.h
index 4a60187b3c..5625313ac7 100644
--- a/libavcodec/huffman.h
+++ b/libavcodec/huffman.h
@@ -1,6 +1,4 @@
-/**
- * @file
- * huffman tree builder and VLC generator
+/*
  * Copyright (C) 2007  Aurelien Jacobs <aurel@gnuage.org>
  *
  * This file is part of Libav.
@@ -20,6 +18,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+/**
+ * @file
+ * huffman tree builder and VLC generator
+ */
+
 #ifndef AVCODEC_HUFFMAN_H
 #define AVCODEC_HUFFMAN_H
 
diff --git a/libavcodec/vorbis.c b/libavcodec/vorbis.c
index f413170b6a..8ff24ab627 100644
--- a/libavcodec/vorbis.c
+++ b/libavcodec/vorbis.c
@@ -1,8 +1,4 @@
-/**
- * @file
- * Common code for Vorbis I encoder and decoder
- * @author Denes Balatoni  ( dbalatoni programozo hu )
- *
+/*
  * This file is part of Libav.
  *
  * Libav is free software; you can redistribute it and/or
@@ -20,6 +16,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+/**
+ * @file
+ * Common code for Vorbis I encoder and decoder
+ * @author Denes Balatoni  ( dbalatoni programozo hu )
+ */
+
 #define ALT_BITSTREAM_READER_LE
 #include "avcodec.h"
 #include "get_bits.h"
diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c
index 9fc60688a2..445e68e3f2 100644
--- a/libavcodec/vorbisdec.c
+++ b/libavcodec/vorbisdec.c
@@ -1,8 +1,4 @@
-/**
- * @file
- * Vorbis I decoder
- * @author Denes Balatoni  ( dbalatoni programozo hu )
- *
+/*
  * This file is part of Libav.
  *
  * Libav is free software; you can redistribute it and/or
@@ -20,6 +16,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+/**
+ * @file
+ * Vorbis I decoder
+ * @author Denes Balatoni  ( dbalatoni programozo hu )
+ */
+
 #include <inttypes.h>
 #include <math.h>
 
diff --git a/libavcodec/vp5.c b/libavcodec/vp5.c
index 807309f603..a057d9bbe1 100644
--- a/libavcodec/vp5.c
+++ b/libavcodec/vp5.c
@@ -1,7 +1,4 @@
-/**
- * @file
- * VP5 compatible video decoder
- *
+/*
  * Copyright (C) 2006  Aurelien Jacobs <aurel@gnuage.org>
  *
  * This file is part of Libav.
@@ -21,6 +18,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+/**
+ * @file
+ * VP5 compatible video decoder
+ */
+
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/libavcodec/vp56.c b/libavcodec/vp56.c
index a181978334..5c7e93e5e6 100644
--- a/libavcodec/vp56.c
+++ b/libavcodec/vp56.c
@@ -1,7 +1,4 @@
-/**
- * @file
- * VP5 and VP6 compatible video decoder (common features)
- *
+/*
  * Copyright (C) 2006  Aurelien Jacobs <aurel@gnuage.org>
  *
  * This file is part of Libav.
@@ -21,6 +18,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+/**
+ * @file
+ * VP5 and VP6 compatible video decoder (common features)
+ */
+
 #include "avcodec.h"
 #include "bytestream.h"
 
diff --git a/libavcodec/vp56.h b/libavcodec/vp56.h
index 5a55f7d6a1..8bb7251fc6 100644
--- a/libavcodec/vp56.h
+++ b/libavcodec/vp56.h
@@ -1,7 +1,4 @@
-/**
- * @file
- * VP5 and VP6 compatible video decoder (common features)
- *
+/*
  * Copyright (C) 2006  Aurelien Jacobs <aurel@gnuage.org>
  *
  * This file is part of Libav.
@@ -21,6 +18,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+/**
+ * @file
+ * VP5 and VP6 compatible video decoder (common features)
+ */
+
 #ifndef AVCODEC_VP56_H
 #define AVCODEC_VP56_H
 
diff --git a/libavcodec/vp56data.c b/libavcodec/vp56data.c
index 7a418761d1..aa1dcefece 100644
--- a/libavcodec/vp56data.c
+++ b/libavcodec/vp56data.c
@@ -1,7 +1,4 @@
-/**
- * @file
- * VP5 and VP6 compatible video decoder (common data)
- *
+/*
  * Copyright (C) 2006  Aurelien Jacobs <aurel@gnuage.org>
  *
  * This file is part of Libav.
@@ -21,6 +18,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+/**
+ * @file
+ * VP5 and VP6 compatible video decoder (common data)
+ */
+
 #include "vp56data.h"
 
 const uint8_t vp56_b2p[]   = { 0, 0, 0, 0, 1, 2, 3, 3, 3, 3 };
diff --git a/libavcodec/vp56data.h b/libavcodec/vp56data.h
index 7be5921e9f..b1f27102ae 100644
--- a/libavcodec/vp56data.h
+++ b/libavcodec/vp56data.h
@@ -1,7 +1,4 @@
-/**
- * @file
- * VP5 and VP6 compatible video decoder (common data)
- *
+/*
  * Copyright (C) 2006  Aurelien Jacobs <aurel@gnuage.org>
  *
  * This file is part of Libav.
@@ -21,6 +18,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+/**
+ * @file
+ * VP5 and VP6 compatible video decoder (common data)
+ */
+
 #ifndef AVCODEC_VP56DATA_H
 #define AVCODEC_VP56DATA_H
 
diff --git a/libavcodec/vp5data.h b/libavcodec/vp5data.h
index 11144a31ad..b11b99d9a9 100644
--- a/libavcodec/vp5data.h
+++ b/libavcodec/vp5data.h
@@ -1,7 +1,4 @@
-/**
- * @file
- * VP5 compatible video decoder
- *
+/*
  * Copyright (C) 2006  Aurelien Jacobs <aurel@gnuage.org>
  *
  * This file is part of Libav.
@@ -21,6 +18,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+/**
+ * @file
+ * VP5 compatible video decoder
+ */
+
 #ifndef AVCODEC_VP5DATA_H
 #define AVCODEC_VP5DATA_H
 
diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c
index 4f3f402c70..42828d8e47 100644
--- a/libavcodec/vp6.c
+++ b/libavcodec/vp6.c
@@ -1,13 +1,6 @@
-/**
- * @file
- * VP6 compatible video decoder
- *
+/*
  * Copyright (C) 2006  Aurelien Jacobs <aurel@gnuage.org>
  *
- * The VP6F decoder accepts an optional 1 byte extradata. It is composed of:
- *  - upper 4bits: difference between encoded width and visible width
- *  - lower 4bits: difference between encoded height and visible height
- *
  * This file is part of Libav.
  *
  * Libav is free software; you can redistribute it and/or
@@ -25,6 +18,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+/**
+ * @file
+ * VP6 compatible video decoder
+ *
+ * The VP6F decoder accepts an optional 1 byte extradata. It is composed of:
+ *  - upper 4 bits: difference between encoded width and visible width
+ *  - lower 4 bits: difference between encoded height and visible height
+ */
+
 #include <stdlib.h>
 
 #include "avcodec.h"
diff --git a/libavcodec/vp6data.h b/libavcodec/vp6data.h
index 2ba3ef3860..9a11f89bf5 100644
--- a/libavcodec/vp6data.h
+++ b/libavcodec/vp6data.h
@@ -1,7 +1,4 @@
-/**
- * @file
- * VP6 compatible video decoder
- *
+/*
  * Copyright (C) 2006  Aurelien Jacobs <aurel@gnuage.org>
  *
  * This file is part of Libav.
@@ -21,6 +18,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+/**
+ * @file
+ * VP6 compatible video decoder
+ */
+
 #ifndef AVCODEC_VP6DATA_H
 #define AVCODEC_VP6DATA_H
 
diff --git a/libavcodec/vp6dsp.c b/libavcodec/vp6dsp.c
index 64282a5b3f..54a96ed13a 100644
--- a/libavcodec/vp6dsp.c
+++ b/libavcodec/vp6dsp.c
@@ -1,7 +1,4 @@
-/**
- * @file
- * VP6 DSP-oriented functions
- *
+/*
  * Copyright (C) 2006  Aurelien Jacobs <aurel@gnuage.org>
  *
  * This file is part of Libav.
@@ -21,6 +18,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+/**
+ * @file
+ * VP6 DSP-oriented functions
+ */
+
 #include "libavutil/common.h"
 #include "vp56dsp.h"
 
diff --git a/libavcodec/vp8data.h b/libavcodec/vp8data.h
index 4ea4581bc9..a48b0f6f9b 100644
--- a/libavcodec/vp8data.h
+++ b/libavcodec/vp8data.h
@@ -1,6 +1,4 @@
-/**
- * VP8 compatible video decoder
- *
+/*
  * Copyright (C) 2010 David Conrad
  * Copyright (C) 2010 Ronald S. Bultje
  *
@@ -21,6 +19,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+/**
+ * @file
+ * VP8 compatible video decoder
+ */
+
 #ifndef AVCODEC_VP8DATA_H
 #define AVCODEC_VP8DATA_H
 
diff --git a/libavcodec/vp8dsp.c b/libavcodec/vp8dsp.c
index 159c070670..89c3453efc 100644
--- a/libavcodec/vp8dsp.c
+++ b/libavcodec/vp8dsp.c
@@ -1,6 +1,4 @@
-/**
- * VP8 compatible video decoder
- *
+/*
  * Copyright (C) 2010 David Conrad
  * Copyright (C) 2010 Ronald S. Bultje
  *
@@ -21,6 +19,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+/**
+ * @file
+ * VP8 compatible video decoder
+ */
+
 #include "dsputil.h"
 #include "vp8dsp.h"
 
diff --git a/libavcodec/vp8dsp.h b/libavcodec/vp8dsp.h
index e2fb8e7cbb..5429e98c2a 100644
--- a/libavcodec/vp8dsp.h
+++ b/libavcodec/vp8dsp.h
@@ -1,6 +1,4 @@
-/**
- * VP8 compatible video decoder
- *
+/*
  * Copyright (C) 2010 David Conrad
  * Copyright (C) 2010 Ronald S. Bultje
  *
@@ -21,6 +19,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+/**
+ * @file
+ * VP8 compatible video decoder
+ */
 
 #ifndef AVCODEC_VP8DSP_H
 #define AVCODEC_VP8DSP_H
diff --git a/libavcodec/yop.c b/libavcodec/yop.c
index 1f1314b6a7..e0b26544be 100644
--- a/libavcodec/yop.c
+++ b/libavcodec/yop.c
@@ -1,5 +1,4 @@
-/**
- * @file
+/*
  * Psygnosis YOP decoder
  *
  * Copyright (C) 2010 Mohamed Naufal Basheer <naufal11@gmail.com>
diff --git a/libavformat/flv.h b/libavformat/flv.h
index c86e20a7cf..6418b27419 100644
--- a/libavformat/flv.h
+++ b/libavformat/flv.h
@@ -1,5 +1,4 @@
-/**
- * @file
+/*
  * FLV common header
  *
  * Copyright (c) 2006 The Libav Project
@@ -21,6 +20,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+/**
+ * @file
+ * FLV common header
+ */
+
 #ifndef AVFORMAT_FLV_H
 #define AVFORMAT_FLV_H
 
diff --git a/libavformat/yop.c b/libavformat/yop.c
index e3671874a1..bc29b0883e 100644
--- a/libavformat/yop.c
+++ b/libavformat/yop.c
@@ -1,5 +1,4 @@
-/**
- * @file
+/*
  * Psygnosis YOP demuxer
  *
  * Copyright (C) 2010 Mohamed Naufal Basheer <naufal11@gmail.com>
diff --git a/libavutil/timer.h b/libavutil/timer.h
index a2ca5cf828..341d508c44 100644
--- a/libavutil/timer.h
+++ b/libavutil/timer.h
@@ -1,7 +1,4 @@
-/**
- * @file
- * high precision timer, useful to profile code
- *
+/*
  * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
  *
  * This file is part of Libav.
@@ -21,6 +18,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+/**
+ * @file
+ * high precision timer, useful to profile code
+ */
+
 #ifndef AVUTIL_TIMER_H
 #define AVUTIL_TIMER_H
 
-- 
cgit v1.2.3


From ad4cd0c2a4d7b2c323900a57f24fcf41d53a2410 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Thu, 14 Jul 2011 03:56:07 +0200
Subject: doxygen: use Doxygen markup for authors and web links where
 appropriate

---
 libavcodec/alac.c         | 4 +---
 libavcodec/eatqi.c        | 6 ++----
 libavcodec/flacdec.c      | 4 +---
 libavcodec/lzw.c          | 2 +-
 libavcodec/lzw.h          | 2 +-
 libavcodec/rl2.c          | 4 +---
 libavcodec/tta.c          | 4 ++--
 libavcodec/vqavideo.c     | 6 +++---
 libavdevice/fbdev.c       | 2 +-
 libavformat/iss.c         | 4 +---
 libavformat/rl2.c         | 4 +---
 libavformat/rtpdec_svq3.c | 2 +-
 libavformat/rtpdec_vp8.c  | 2 +-
 13 files changed, 17 insertions(+), 29 deletions(-)

diff --git a/libavcodec/alac.c b/libavcodec/alac.c
index 4ea3f7ee84..f7e674927b 100644
--- a/libavcodec/alac.c
+++ b/libavcodec/alac.c
@@ -23,9 +23,7 @@
  * @file
  * ALAC (Apple Lossless Audio Codec) decoder
  * @author 2005 David Hammerton
- *
- * For more information on the ALAC format, visit:
- *  http://crazney.net/programs/itunes/alac.html
+ * @see http://crazney.net/programs/itunes/alac.html
  *
  * Note: This decoder expects a 36- (0x24-)byte QuickTime atom to be
  * passed through the extradata[_size] fields. This atom is tacked onto
diff --git a/libavcodec/eatqi.c b/libavcodec/eatqi.c
index aa96437013..1215fa217b 100644
--- a/libavcodec/eatqi.c
+++ b/libavcodec/eatqi.c
@@ -22,10 +22,8 @@
 /**
  * @file
  * Electronic Arts TQI Video Decoder
- * by Peter Ross <pross@xvid.org>
- *
- * Technical details here:
- * http://wiki.multimedia.cx/index.php?title=Electronic_Arts_TQI
+ * @author Peter Ross <pross@xvid.org>
+ * @see http://wiki.multimedia.cx/index.php?title=Electronic_Arts_TQI
  */
 
 #include "avcodec.h"
diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c
index 1ce8559de6..fb18c85946 100644
--- a/libavcodec/flacdec.c
+++ b/libavcodec/flacdec.c
@@ -23,9 +23,7 @@
  * @file
  * FLAC (Free Lossless Audio Codec) decoder
  * @author Alex Beregszaszi
- *
- * For more information on the FLAC format, visit:
- *  http://flac.sourceforge.net/
+ * @see http://flac.sourceforge.net/
  *
  * This decoder can be used in 1 of 2 ways: Either raw FLAC data can be fed
  * through, starting from the initial 'fLaC' signature; or by passing the
diff --git a/libavcodec/lzw.c b/libavcodec/lzw.c
index 6129429053..873b31445b 100644
--- a/libavcodec/lzw.c
+++ b/libavcodec/lzw.c
@@ -24,7 +24,7 @@
  * @file
  * @brief LZW decoding routines
  * @author Fabrice Bellard
- * Modified for use in TIFF by Konstantin Shishkov
+ * @author modified for use in TIFF by Konstantin Shishkov
  */
 
 #include "avcodec.h"
diff --git a/libavcodec/lzw.h b/libavcodec/lzw.h
index c6ae05732c..ab782f5219 100644
--- a/libavcodec/lzw.h
+++ b/libavcodec/lzw.h
@@ -24,7 +24,7 @@
  * @file
  * @brief LZW decoding routines
  * @author Fabrice Bellard
- * modified for use in TIFF by Konstantin Shishkov
+ * @author modified for use in TIFF by Konstantin Shishkov
  */
 
 #ifndef AVCODEC_LZW_H
diff --git a/libavcodec/rl2.c b/libavcodec/rl2.c
index 9d436a682f..59f9bfb134 100644
--- a/libavcodec/rl2.c
+++ b/libavcodec/rl2.c
@@ -23,9 +23,7 @@
  * @file
  * RL2 Video Decoder
  * @author Sascha Sommer (saschasommer@freenet.de)
- *
- * For more information about the RL2 format, visit:
- *   http://wiki.multimedia.cx/index.php?title=RL2
+ * @see http://wiki.multimedia.cx/index.php?title=RL2
  */
 
 #include <stdio.h>
diff --git a/libavcodec/tta.c b/libavcodec/tta.c
index 57f5818d7b..001b1197b6 100644
--- a/libavcodec/tta.c
+++ b/libavcodec/tta.c
@@ -22,9 +22,9 @@
 /**
  * @file
  * TTA (The Lossless True Audio) decoder
- * (www.true-audio.com or tta.corecodec.org)
+ * @see http://www.true-audio.com/
+ * @see http://tta.corecodec.org/
  * @author Alex Beregszaszi
- *
  */
 
 #define ALT_BITSTREAM_READER_LE
diff --git a/libavcodec/vqavideo.c b/libavcodec/vqavideo.c
index caffddbfa4..55b95dceba 100644
--- a/libavcodec/vqavideo.c
+++ b/libavcodec/vqavideo.c
@@ -21,9 +21,9 @@
 
 /**
  * @file
- * VQA Video Decoder by Mike Melanson (melanson@pcisys.net)
- * For more information about the VQA format, visit:
- *   http://wiki.multimedia.cx/index.php?title=VQA
+ * VQA Video Decoder
+ * @author Mike Melanson (melanson@pcisys.net)
+ * @see http://wiki.multimedia.cx/index.php?title=VQA
  *
  * The VQA video decoder outputs PAL8 or RGB555 colorspace data, depending
  * on the type of data in the file.
diff --git a/libavdevice/fbdev.c b/libavdevice/fbdev.c
index 2f3e0ff937..eb654aa4b3 100644
--- a/libavdevice/fbdev.c
+++ b/libavdevice/fbdev.c
@@ -24,7 +24,7 @@
  * @file
  * Linux framebuffer input device,
  * inspired by code from fbgrab.c by Gunnar Monell.
- * See also http://linux-fbdev.sourceforge.net/.
+ * @see http://linux-fbdev.sourceforge.net/
  */
 
 /* #define DEBUG */
diff --git a/libavformat/iss.c b/libavformat/iss.c
index 100066bad2..7989194126 100644
--- a/libavformat/iss.c
+++ b/libavformat/iss.c
@@ -23,9 +23,7 @@
  * @file
  * Funcom ISS file demuxer
  * @author Jaikrishnan Menon
- *
- * For more information on the .iss file format, visit:
- * http://wiki.multimedia.cx/index.php?title=FunCom_ISS
+ * @see http://wiki.multimedia.cx/index.php?title=FunCom_ISS
  */
 
 #include "avformat.h"
diff --git a/libavformat/rl2.c b/libavformat/rl2.c
index 68c1a01636..c84e4e1705 100644
--- a/libavformat/rl2.c
+++ b/libavformat/rl2.c
@@ -23,9 +23,7 @@
  * RL2 file demuxer
  * @file
  * @author Sascha Sommer (saschasommer@freenet.de)
- *
- * For more information regarding the RL2 file format, visit:
- *   http://wiki.multimedia.cx/index.php?title=RL2
+ * @see http://wiki.multimedia.cx/index.php?title=RL2
  *
  * extradata:
  * 2 byte le initial drawing offset within 320x200 viewport
diff --git a/libavformat/rtpdec_svq3.c b/libavformat/rtpdec_svq3.c
index 331434245e..4df3e3a3e0 100644
--- a/libavformat/rtpdec_svq3.c
+++ b/libavformat/rtpdec_svq3.c
@@ -22,8 +22,8 @@
 /**
  * @file
  * @brief RTP support for the SV3V (SVQ3) payload
- * (http://wiki.multimedia.cx/index.php?title=Sorenson_Video_3#Packetization)
  * @author Ronald S. Bultje <rbultje@ronald.bitfreak.net>
+ * @see http://wiki.multimedia.cx/index.php?title=Sorenson_Video_3#Packetization
  */
 
 #include <string.h>
diff --git a/libavformat/rtpdec_vp8.c b/libavformat/rtpdec_vp8.c
index 026728ec9d..d13c3982df 100644
--- a/libavformat/rtpdec_vp8.c
+++ b/libavformat/rtpdec_vp8.c
@@ -23,7 +23,7 @@
  * @file
  * @brief RTP support for the VP8 payload
  * @author Josh Allmann <joshua.allmann@gmail.com>
- * ( http://www.webmproject.org/code/specs/rtp/ )
+ * @see http://www.webmproject.org/code/specs/rtp/
  */
 
 #include "libavcodec/bytestream.h"
-- 
cgit v1.2.3


From bee6d2fd76015b1ee0d73c5f3500b0a7d0109199 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Fri, 15 Jul 2011 00:45:23 +0200
Subject: doxygen: replace @sa tag by the more readable but equivalent @see

---
 libavcodec/bethsoftvideo.c | 4 ++--
 libavcodec/bfi.c           | 2 +-
 libavcodec/cdgraphics.c    | 4 ++--
 libavcodec/pcxenc.c        | 2 +-
 libavcodec/tmv.c           | 2 +-
 libavformat/bethsoftvid.c  | 4 ++--
 libavformat/bfi.c          | 2 +-
 libavformat/qcp.c          | 2 +-
 libavformat/soxdec.c       | 2 +-
 libavformat/soxenc.c       | 2 +-
 libavformat/tmv.c          | 2 +-
 11 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/libavcodec/bethsoftvideo.c b/libavcodec/bethsoftvideo.c
index d294bbfe74..bd21dbff63 100644
--- a/libavcodec/bethsoftvideo.c
+++ b/libavcodec/bethsoftvideo.c
@@ -23,8 +23,8 @@
  * @file
  * @brief Bethesda Softworks VID Video Decoder
  * @author Nicholas Tung [ntung (at. ntung com] (2007-03)
- * @sa http://wiki.multimedia.cx/index.php?title=Bethsoft_VID
- * @sa http://www.svatopluk.com/andux/docs/dfvid.html
+ * @see http://wiki.multimedia.cx/index.php?title=Bethsoft_VID
+ * @see http://www.svatopluk.com/andux/docs/dfvid.html
  */
 
 #include "libavutil/common.h"
diff --git a/libavcodec/bfi.c b/libavcodec/bfi.c
index c97dfe2dc0..3c66226041 100644
--- a/libavcodec/bfi.c
+++ b/libavcodec/bfi.c
@@ -23,7 +23,7 @@
  * @file
  * @brief Brute Force & Ignorance (.bfi) video decoder
  * @author Sisir Koppaka ( sisir.koppaka at gmail dot com )
- * @sa http://wiki.multimedia.cx/index.php?title=BFI
+ * @see http://wiki.multimedia.cx/index.php?title=BFI
  */
 
 #include "libavutil/common.h"
diff --git a/libavcodec/cdgraphics.c b/libavcodec/cdgraphics.c
index 2f8e98ca3d..9e3f19a5f7 100644
--- a/libavcodec/cdgraphics.c
+++ b/libavcodec/cdgraphics.c
@@ -26,8 +26,8 @@
  * @file
  * @brief CD Graphics Video Decoder
  * @author Michael Tison
- * @sa http://wiki.multimedia.cx/index.php?title=CD_Graphics
- * @sa http://www.ccs.neu.edu/home/bchafy/cdb/info/cdg
+ * @see http://wiki.multimedia.cx/index.php?title=CD_Graphics
+ * @see http://www.ccs.neu.edu/home/bchafy/cdb/info/cdg
  */
 
 /// default screen sizes
diff --git a/libavcodec/pcxenc.c b/libavcodec/pcxenc.c
index 2df84afa38..6d17987d03 100644
--- a/libavcodec/pcxenc.c
+++ b/libavcodec/pcxenc.c
@@ -23,7 +23,7 @@
  * @file
  * PCX image encoder
  * @author Daniel Verkamp
- * @sa http://www.qzx.com/pc-gpe/pcx.txt
+ * @see http://www.qzx.com/pc-gpe/pcx.txt
  */
 
 #include "avcodec.h"
diff --git a/libavcodec/tmv.c b/libavcodec/tmv.c
index d540182ada..870f57159c 100644
--- a/libavcodec/tmv.c
+++ b/libavcodec/tmv.c
@@ -23,7 +23,7 @@
  * @file
  * 8088flex TMV video decoder
  * @author Daniel Verkamp
- * @sa http://www.oldskool.org/pc/8088_Corruption
+ * @see http://www.oldskool.org/pc/8088_Corruption
  */
 
 #include "avcodec.h"
diff --git a/libavformat/bethsoftvid.c b/libavformat/bethsoftvid.c
index 5e6a776824..73564c95fe 100644
--- a/libavformat/bethsoftvid.c
+++ b/libavformat/bethsoftvid.c
@@ -23,8 +23,8 @@
  * @file
  * @brief Bethesda Softworks VID (.vid) file demuxer
  * @author Nicholas Tung [ntung (at. ntung com] (2007-03)
- * @sa http://wiki.multimedia.cx/index.php?title=Bethsoft_VID
- * @sa http://www.svatopluk.com/andux/docs/dfvid.html
+ * @see http://wiki.multimedia.cx/index.php?title=Bethsoft_VID
+ * @see http://www.svatopluk.com/andux/docs/dfvid.html
  */
 
 #include "libavutil/intreadwrite.h"
diff --git a/libavformat/bfi.c b/libavformat/bfi.c
index bc26d47c9e..72df8b2afb 100644
--- a/libavformat/bfi.c
+++ b/libavformat/bfi.c
@@ -23,7 +23,7 @@
  * @file
  * @brief Brute Force & Ignorance (.bfi) file demuxer
  * @author Sisir Koppaka ( sisir.koppaka at gmail dot com )
- * @sa http://wiki.multimedia.cx/index.php?title=BFI
+ * @see http://wiki.multimedia.cx/index.php?title=BFI
  */
 
 #include "libavutil/intreadwrite.h"
diff --git a/libavformat/qcp.c b/libavformat/qcp.c
index 635d531f44..aefb076e3b 100644
--- a/libavformat/qcp.c
+++ b/libavformat/qcp.c
@@ -23,7 +23,7 @@
  * @file
  * QCP format (.qcp) demuxer
  * @author Kenan Gillet
- * @sa RFC 3625: "The QCP File Format and Media Types for Speech Data"
+ * @see RFC 3625: "The QCP File Format and Media Types for Speech Data"
  *     http://tools.ietf.org/html/rfc3625
  */
 
diff --git a/libavformat/soxdec.c b/libavformat/soxdec.c
index ca82ef1cca..7661bf1f8f 100644
--- a/libavformat/soxdec.c
+++ b/libavformat/soxdec.c
@@ -26,7 +26,7 @@
  * @file
  * SoX native format demuxer
  * @author Daniel Verkamp
- * @sa http://wiki.multimedia.cx/index.php?title=SoX_native_intermediate_format
+ * @see http://wiki.multimedia.cx/index.php?title=SoX_native_intermediate_format
  */
 
 #include "libavutil/intreadwrite.h"
diff --git a/libavformat/soxenc.c b/libavformat/soxenc.c
index e28c479c97..d7afe70aac 100644
--- a/libavformat/soxenc.c
+++ b/libavformat/soxenc.c
@@ -26,7 +26,7 @@
  * @file
  * SoX native format muxer
  * @author Daniel Verkamp
- * @sa http://wiki.multimedia.cx/index.php?title=SoX_native_intermediate_format
+ * @see http://wiki.multimedia.cx/index.php?title=SoX_native_intermediate_format
  */
 
 #include "libavutil/intreadwrite.h"
diff --git a/libavformat/tmv.c b/libavformat/tmv.c
index 79a875885e..fe8b64b3dd 100644
--- a/libavformat/tmv.c
+++ b/libavformat/tmv.c
@@ -23,7 +23,7 @@
  * @file
  * 8088flex TMV file demuxer
  * @author Daniel Verkamp
- * @sa http://www.oldskool.org/pc/8088_Corruption
+ * @see http://www.oldskool.org/pc/8088_Corruption
  */
 
 #include "libavutil/intreadwrite.h"
-- 
cgit v1.2.3


From 66f6bab7ad2034672f3c6fe9602b59fe291d2d60 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Fri, 15 Jul 2011 00:45:59 +0200
Subject: mem.h: switch doxygen parameter order to match function prototype

---
 libavutil/mem.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavutil/mem.h b/libavutil/mem.h
index 5dea492021..e14e8d038c 100644
--- a/libavutil/mem.h
+++ b/libavutil/mem.h
@@ -76,10 +76,10 @@ void *av_malloc(size_t size) av_malloc_attrib av_alloc_size(1);
  * Allocate or reallocate a block of memory.
  * If ptr is NULL and size > 0, allocate a new block. If
  * size is zero, free the memory block pointed to by ptr.
- * @param size Size in bytes for the memory block to be allocated or
- * reallocated.
  * @param ptr Pointer to a memory block already allocated with
  * av_malloc(z)() or av_realloc() or NULL.
+ * @param size Size in bytes for the memory block to be allocated or
+ * reallocated.
  * @return Pointer to a newly reallocated block or NULL if the block
  * cannot be reallocated or the function is used to free the memory block.
  * @see av_fast_realloc()
-- 
cgit v1.2.3


From e3bc07f4af25287fa4ade1e9c5501de65c8a698e Mon Sep 17 00:00:00 2001
From: Martin Storsjö <martin@martin.st>
Date: Fri, 15 Jul 2011 10:53:12 +0300
Subject: configure: Automatically add more flags required on symbian
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Martin Storsjö <martin@martin.st>
---
 configure | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 596b6039e3..28e3e25f18 100755
--- a/configure
+++ b/configure
@@ -2499,7 +2499,14 @@ case $target_os in
     symbian)
         SLIBSUF=".dll"
         enable dos_paths
-        add_cflags --include=$sysinclude/gcce/gcce.h
+        add_cflags --include=$sysinclude/gcce/gcce.h -fvisibility=default
+        add_cppflags -D__GCCE__ -D__SYMBIAN32__ -DSYMBIAN_OE_POSIX_SIGNALS
+        add_ldflags -Wl,--target1-abs,--no-undefined \
+                    -Wl,-Ttext,0x80000,-Tdata,0x1000000 -shared \
+                    -Wl,--entry=_E32Startup -Wl,-u,_E32Startup
+        add_extralibs -l:eexe.lib -l:usrt2_2.lib -l:dfpaeabi.dso \
+                      -l:drtaeabi.dso -l:scppnwdl.dso -lsupc++ -lgcc \
+                      -l:libc.dso -l:libm.dso -l:euser.dso -l:libcrt0.lib
         ;;
     none)
         ;;
-- 
cgit v1.2.3