summaryrefslogtreecommitdiff
path: root/libavcodec/vda_h264.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-11-29 00:20:29 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-11-29 00:20:29 +0100
commit4dcd1a3145dd93602b86a44ebc07d98ca2a30ab6 (patch)
tree694f5d2cba955bc53de20f8fb81cb54439ae5279 /libavcodec/vda_h264.c
parent4b03d960220d15cb915c2c8f15970d2f36f25cd9 (diff)
parentac47e014bbaf5163871a8beb7522015e0bc27615 (diff)
downloadffmpeg-4dcd1a3145dd93602b86a44ebc07d98ca2a30ab6.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: adtsenc: Check frame size. txd: Fix order of operations. APIchanges: fill in some blanks timer: fix misspelling of "decicycles" Eliminate pointless 0/NULL initializers in AVCodec and similar declarations. indeo3: cosmetics md5proto: Fix order of operations. dca: Replace oversized unused get_bits() with skip_bits_long(). Conflicts: doc/APIchanges libavformat/mmsh.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vda_h264.c')
-rw-r--r--libavcodec/vda_h264.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/vda_h264.c b/libavcodec/vda_h264.c
index 6ea5e0fdd7..254268f558 100644
--- a/libavcodec/vda_h264.c
+++ b/libavcodec/vda_h264.c
@@ -86,7 +86,6 @@ AVHWAccel ff_h264_vda_hwaccel = {
.type = AVMEDIA_TYPE_VIDEO,
.id = CODEC_ID_H264,
.pix_fmt = PIX_FMT_VDA_VLD,
- .capabilities = 0,
.start_frame = start_frame,
.decode_slice = decode_slice,
.end_frame = end_frame,