Mercurial > libavcodec.hg

comparison h264.c @ 9012:15a3df8c01fd libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More approved hunks for VAAPI & our new and cleaner hwaccel API. patch by Gwenole Beauchesne gbeauchesne splitted-desktop com
author michael
date Mon, 23 Feb 2009 13:44:51 +0000
parents aae80543bc6e
children ccde7fbba09e
comparison
equal deleted inserted replaced
9011:90c99bda19f5 9012:15a3df8c01fd
23 * @file libavcodec/h264.c 23 * @file libavcodec/h264.c
24 * H.264 / AVC / MPEG4 part10 codec. 24 * H.264 / AVC / MPEG4 part10 codec.
25 * @author Michael Niedermayer <michaelni@gmx.at> 25 * @author Michael Niedermayer <michaelni@gmx.at>
26 */ 26 */
27 27
28 #include "internal.h"
28 #include "dsputil.h" 29 #include "dsputil.h"
29 #include "avcodec.h" 30 #include "avcodec.h"
30 #include "mpegvideo.h" 31 #include "mpegvideo.h"
31 #include "h264.h" 32 #include "h264.h"
32 #include "h264data.h" 33 #include "h264data.h"
7354 MpegEncContext * const s = &h->s; 7355 MpegEncContext * const s = &h->s;
7355 AVCodecContext * const avctx= s->avctx; 7356 AVCodecContext * const avctx= s->avctx;
7356 H264Context *hx; 7357 H264Context *hx;
7357 int i; 7358 int i;
7358 7359
7360 if (s->avctx->hwaccel)
7361 return;
7359 if(s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU) 7362 if(s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU)
7360 return; 7363 return;
7361 if(context_count == 1) { 7364 if(context_count == 1) {
7362 decode_slice(avctx, &h); 7365 decode_slice(avctx, &h);
7363 } else { 7366 } else {