Update public FFmpeg header files from r16647 to r18286.

third_party/ffmpeg/include/libavcodec/vdpau.h

 /*
  * The Video Decode and Presentation API for UNIX (VDPAU) is used for
  * hardware-accelerated decoding of MPEG-1/2, H.264 and VC-1.
  *
  * Copyright (C) 2008 NVIDIA
  *
  * This file is part of FFmpeg.
  *
  * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ skipping 52 matching lines @@
  * picture parameter, bitstream information etc which are passed
  * between the FFmpeg decoder and its clients.
  */
 struct vdpau_render_state {
     VdpVideoSurface surface; ///< Used as rendered surface, never changed.
 
     int state; ///< Holds FF_VDPAU_STATE_* values.
 
     /** picture parameter information for all supported codecs */
     union VdpPictureInfo {
+        VdpPictureInfoH264     h264;
         VdpPictureInfoMPEG1Or2 mpeg;
-        VdpPictureInfoH264     h264;
+        VdpPictureInfoVC1       vc1;
     } info;
 
     /** Describe size/location of the compressed video data. */
     int bitstream_buffers_allocated;
     int bitstream_buffers_used;
     VdpBitstreamBuffer *bitstream_buffers;
 };
 
 /* @}*/
 
 #endif /* AVCODEC_VDPAU_H */