diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-11-02 11:58:01 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-11-02 11:58:01 +0100 |
| commit | d15adeacf3e61cd8d2169c090bf06f6d8fc62f8b (patch) | |
| tree | 501bec80e50a7dea73cbf7a9d0f43af5d1b587e6 /libavcodec/h263dec.c | |
| parent | b0b752334c29890020d9cb12a348cc9e6320f5e3 (diff) | |
| parent | d35d0c723e3c8fc8cde76bf677f67928f5e179a8 (diff) | |
| download | ffmpeg-d15adeacf3e61cd8d2169c090bf06f6d8fc62f8b.tar.gz | |
Merge commit 'd35d0c723e3c8fc8cde76bf677f67928f5e179a8'
* commit 'd35d0c723e3c8fc8cde76bf677f67928f5e179a8':
vdpau: remove dysfunctional H.263 support
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/h263dec.c')
| -rw-r--r-- | libavcodec/h263dec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 1958119f1e..ca7e5ebe9b 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -722,7 +722,7 @@ const enum AVPixelFormat ff_h263_hwaccel_pixfmt_list_420[] = { #if CONFIG_H263_VAAPI_HWACCEL || CONFIG_MPEG4_VAAPI_HWACCEL AV_PIX_FMT_VAAPI, #endif -#if CONFIG_H263_VDPAU_HWACCEL || CONFIG_MPEG4_VDPAU_HWACCEL +#if CONFIG_MPEG4_VDPAU_HWACCEL AV_PIX_FMT_VDPAU, #endif #if CONFIG_H263_VIDEOTOOLBOX_HWACCEL || CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL |