aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/utils.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2009-02-23 13:35:52 +0000
committerMichael Niedermayer <michaelni@gmx.at>2009-02-23 13:35:52 +0000
commitc269cf68a0d1579f41e082288072e3f182ef2b5f (patch)
treee853fde01f405ae55d75f11c3dd422181f5ba0d9 /libavcodec/utils.c
parent1d14361dec7d6fcfaf1ed579ae9a5e8f9d84abab (diff)
downloadffmpeg-c269cf68a0d1579f41e082288072e3f182ef2b5f.tar.gz
Approved hunks for VAAPI / our new shiny hwaccel API
by Gwenole Beauchesne gbeauchesne splitted desktop com Originally committed as revision 17539 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/utils.c')
-rw-r--r--libavcodec/utils.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 215029d789..2ae5ce4fd4 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -391,7 +391,9 @@ int avcodec_default_execute(AVCodecContext *c, int (*func)(AVCodecContext *c2, v
return 0;
}
-enum PixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum PixelFormat * fmt){
+enum PixelFormat avcodec_default_get_format(struct AVCodecContext *s, const enum PixelFormat *fmt){
+ while (*fmt != PIX_FMT_NONE && ff_is_hwaccel_pix_fmt(*fmt))
+ ++fmt;
return fmt[0];
}