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/Makefile | |
| parent | b0b752334c29890020d9cb12a348cc9e6320f5e3 (diff) | |
| parent | d35d0c723e3c8fc8cde76bf677f67928f5e179a8 (diff) | |
| download | ffmpeg-streaming-d15adeacf3e61cd8d2169c090bf06f6d8fc62f8b.zip ffmpeg-streaming-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/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 8162447..b61424f 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -714,7 +714,6 @@ OBJS-$(CONFIG_VIDEOTOOLBOX) += videotoolbox.o OBJS-$(CONFIG_VDPAU) += vdpau.o OBJS-$(CONFIG_H263_VAAPI_HWACCEL) += vaapi_mpeg4.o -OBJS-$(CONFIG_H263_VDPAU_HWACCEL) += vdpau_mpeg4.o OBJS-$(CONFIG_H263_VIDEOTOOLBOX_HWACCEL) += videotoolbox.o OBJS-$(CONFIG_H264_D3D11VA_HWACCEL) += dxva2_h264.o OBJS-$(CONFIG_H264_DXVA2_HWACCEL) += dxva2_h264.o |
