FFmpeg sync to revision 21657, Refs #7233

The most important change in this sync is probably the optimized H.264 decoder (approx. 15% faster on X86_64 linux). For fans of hardware assisted decoding VDPAU mpeg4 asp and DXVA2 (H.264, VC1, WMV3) were added (MythTV needs to be changed to make use of them). Support for BluRay subtitles and PCM are the most prominent added decoders. git-svn-id: http://svn.mythtv.org/svn/trunk@23525 7dbf422c-18fa-0310-86e9-fd20926502f2
MythTV · Feb 10, 2010 · 3cc5fc8 · 3cc5fc8
1 parent 3bb7e75
commit 3cc5fc8
Show file tree

Hide file tree

Showing 676 changed files with 79,516 additions and 37,700 deletions.
diff --git a/mythtv/configure b/mythtv/configure
diff --git a/mythtv/filters/adjust/filter_adjust.c b/mythtv/filters/adjust/filter_adjust.c
@@ -17,7 +17,7 @@
 
 #ifdef HAVE_MMX
 
-#include "libavutil/declare_aligned.h"
+#include "libavutil/mem.h"
 #include "dsputil.h"
 #include "x86/mmx.h"
 

diff --git a/mythtv/filters/crop/filter_crop.c b/mythtv/filters/crop/filter_crop.c
@@ -19,7 +19,7 @@
 
 #include "filter.h"
 #include "frame.h"
-#include "libavutil/declare_aligned.h"
+#include "libavutil/mem.h"
 #include "dsputil.h"
 
 #ifdef MMX

diff --git a/mythtv/filters/greedyhdeint/color.c b/mythtv/filters/greedyhdeint/color.c
@@ -30,7 +30,7 @@
 #endif
 #include <math.h>
 
-#include "libavutil/declare_aligned.h"
+#include "libavutil/mem.h"
 #include "dsputil.h"
 
 #include "color.h"

diff --git a/mythtv/filters/mm_arch.h b/mythtv/filters/mm_arch.h
@@ -1,6 +1,6 @@
 /* mm_arch.h - Multi-media CPU acceleration for several architectures */
 
-#include "libavutil/declare_aligned.h"
+#include "libavutil/mem.h"
 #include "dsputil.h"
 
 /* That has "extern int mm_flags;", or "#define mm_flags 0" as a fallthru.  */

diff --git a/mythtv/filters/quickdnr/filter_quickdnr.c b/mythtv/filters/quickdnr/filter_quickdnr.c
@@ -22,7 +22,7 @@
 
 #include "filter.h"
 #include "frame.h"
-#include "libavutil/declare_aligned.h"
+#include "libavutil/mem.h"
 #include "dsputil.h"
 
 #ifdef MMX

diff --git a/mythtv/libs/libavcodec/4xm.c b/mythtv/libs/libavcodec/4xm.c
@@ -137,7 +137,7 @@ typedef struct FourXContext{
     int mv[256];
     VLC pre_vlc;
     int last_dc;
-    DECLARE_ALIGNED_8(DCTELEM, block[6][64]);
+    DECLARE_ALIGNED_16(DCTELEM, block)[6][64];
     void *bitstream_buffer;
     unsigned int bitstream_buffer_size;
     int version;
@@ -815,7 +815,7 @@ static av_cold int decode_init(AVCodecContext *avctx){
     init_vlcs(f);
 
     if(f->version>2) avctx->pix_fmt= PIX_FMT_RGB565;
-    else             avctx->pix_fmt= PIX_FMT_RGB555;
+    else             avctx->pix_fmt= PIX_FMT_BGR555;
 
     return 0;
 }
@@ -832,6 +832,10 @@ static av_cold int decode_end(AVCodecContext *avctx){
         f->cfrm[i].allocated_size= 0;
     }
     free_vlc(&f->pre_vlc);
+    if(f->current_picture.data[0])
+        avctx->release_buffer(avctx, &f->current_picture);
+    if(f->last_picture.data[0])
+        avctx->release_buffer(avctx, &f->last_picture);
 
     return 0;
 }

diff --git a/mythtv/libs/libavcodec/8bps.c b/mythtv/libs/libavcodec/8bps.c
@@ -159,10 +159,6 @@ static av_cold int decode_init(AVCodecContext *avctx)
 
         c->pic.data[0] = NULL;
 
-    if (avcodec_check_dimensions(avctx, avctx->width, avctx->height) < 0) {
-        return 1;
-    }
-
         switch (avctx->bits_per_coded_sample) {
                 case 8:
                         avctx->pix_fmt = PIX_FMT_PAL8;
@@ -183,7 +179,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
                 case 32:
                         avctx->pix_fmt = PIX_FMT_RGB32;
                         c->planes = 4;
-#ifdef WORDS_BIGENDIAN
+#if HAVE_BIGENDIAN
                         c->planemap[0] = 1; // 1st plane is red
                         c->planemap[1] = 2; // 2nd plane is green
                         c->planemap[2] = 3; // 3rd plane is blue