diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-15 03:13:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-15 03:13:42 +0100 |
| commit | a72580fc9efeb674257b4754ca5de0fa34b09be8 (patch) | |
| tree | 317e10288d30721f1f20c6c5bb9d99945d4351bd /libavutil/pixdesc.c | |
| parent | be4c9a440f4e8b6ea01112d98a2cc128b8c52295 (diff) | |
| parent | 3f5d6a665aba439a9309ed735e71403d236a313d (diff) | |
| download | ffmpeg-a72580fc9efeb674257b4754ca5de0fa34b09be8.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
binkvideo: simplify and remove invalid shifts
pulse: compute frame_duration once and fix it
lavf: simplify format_child_class_next()
hwaccel: OS X Video Decoder Acceleration (VDA) support.
doc: add support for an optional navigation bar in texi2html pages
Conflicts:
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/vda.c
libavcodec/vda.h
libavcodec/vda_h264.c
libavcodec/vda_internal.h
libavcodec/version.h
libavformat/options.c
libavutil/avutil.h
libavutil/pixfmt.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/pixdesc.c')
| -rw-r--r-- | libavutil/pixdesc.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index 6648a7e8f5..958499db9d 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -790,6 +790,12 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = { .log2_chroma_h = 1, .flags = PIX_FMT_HWACCEL, }, + [PIX_FMT_VDA_VLD] = { + .name = "vda_vld", + .log2_chroma_w = 1, + .log2_chroma_h = 1, + .flags = PIX_FMT_HWACCEL, + }, [PIX_FMT_YUV420P9LE] = { .name = "yuv420p9le", .nb_components= 3, |