[FFmpeg-devel] [PATCH]VDPAU patch for MPEG1/2 decoding, round 4

[Michael Niedermayer]

On Sun, Jan 11, 2009 at 02:14:14AM +0100, Carl Eugen Hoyos wrote:
> Hi!
>
> I moved ff_vdpau_mpeg_field_start() into ff_vdpau_mpeg_picture_complete().
>
> Please comment, Carl Eugen

> Index: libavutil/avutil.h
> ===================================================================
> --- libavutil/avutil.h	(revision 16504)
> +++ libavutil/avutil.h	(working copy)
> @@ -122,6 +122,8 @@
>      PIX_FMT_YUVJ440P,  ///< Planar YUV 4:4:0 full scale (jpeg)
>      PIX_FMT_YUVA420P,  ///< Planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2 Y & A samples)
>      PIX_FMT_VDPAU_H264,///< H264 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
> +    PIX_FMT_VDPAU_MPEG1,///< MPEG1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
> +    PIX_FMT_VDPAU_MPEG2,///< MPEG2 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
>      PIX_FMT_NB,        ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions
>  };
>  

are 2 really needed?


> Index: libavcodec/vdpau_internal.h
> ===================================================================
> --- libavcodec/vdpau_internal.h	(revision 16521)
> +++ libavcodec/vdpau_internal.h	(working copy)
> @@ -26,9 +26,15 @@
>  
>  #include <stdint.h>
>  #include "h264.h"
> +#undef interlaced_dct
> +#undef mb_intra

It may be better to remove the 2 offending #defines from h264.h if no
other solution is found

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

I have never wished to cater to the crowd; for what I know they do not
approve, and what they approve I do not know. -- Epicurus
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20090111/f5bd0574/attachment.pgp>