Merge commit 'bd49be885e9ad6bae599c54473ba2fa2957eb140'

* commit 'bd49be885e9ad6bae599c54473ba2fa2957eb140':
  avconv_vdpau: use the hwcontext API to simplify code

Tested-by: wm4
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

1 files changed, 0 insertions, 1 deletions

diff --git a/ffmpeg.h b/ffmpeg.h
index 20322b0422..403b098687 100644
--- a/ffmpeg.h
+++ b/ffmpeg.h
@@ -538,7 +538,6 @@ extern int stdin_interaction;
 extern int frame_bits_per_raw_sample;
 extern AVIOContext *progress_avio;
 extern float max_error_rate;
-extern int vdpau_api_ver;
 extern char *videotoolbox_pixfmt;
 
 extern const AVIOInterruptCB int_cb;