diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-29 00:20:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-29 00:20:29 +0100 |
| commit | 4dcd1a3145dd93602b86a44ebc07d98ca2a30ab6 (patch) | |
| tree | 694f5d2cba955bc53de20f8fb81cb54439ae5279 /libavcodec/vaapi_vc1.c | |
| parent | 4b03d960220d15cb915c2c8f15970d2f36f25cd9 (diff) | |
| parent | ac47e014bbaf5163871a8beb7522015e0bc27615 (diff) | |
| download | ffmpeg-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/vaapi_vc1.c')
| -rw-r--r-- | libavcodec/vaapi_vc1.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libavcodec/vaapi_vc1.c b/libavcodec/vaapi_vc1.c index 09bef4a5f9..ad5a89fe6f 100644 --- a/libavcodec/vaapi_vc1.c +++ b/libavcodec/vaapi_vc1.c @@ -346,11 +346,9 @@ AVHWAccel ff_wmv3_vaapi_hwaccel = { .type = AVMEDIA_TYPE_VIDEO, .id = CODEC_ID_WMV3, .pix_fmt = PIX_FMT_VAAPI_VLD, - .capabilities = 0, .start_frame = vaapi_vc1_start_frame, .end_frame = vaapi_vc1_end_frame, .decode_slice = vaapi_vc1_decode_slice, - .priv_data_size = 0, }; #endif @@ -359,9 +357,7 @@ AVHWAccel ff_vc1_vaapi_hwaccel = { .type = AVMEDIA_TYPE_VIDEO, .id = CODEC_ID_VC1, .pix_fmt = PIX_FMT_VAAPI_VLD, - .capabilities = 0, .start_frame = vaapi_vc1_start_frame, .end_frame = vaapi_vc1_end_frame, .decode_slice = vaapi_vc1_decode_slice, - .priv_data_size = 0, }; |