Use "!exp" instead of "exp == NULL" in if condition.

[ffmpeg] / libavcodec / vdpau.h

diff --git a/libavcodec/vdpau.h b/libavcodec/vdpau.h
index 5ed3206bee9de7f60513e05be5a73ecd2a766a41..53dbd7c02a61eda1fbb7911c85396b4c12861e33 100644 (file)
--- a/libavcodec/vdpau.h
+++ b/libavcodec/vdpau.h
@@ -44,8 +44,8 @@
  * @{
  */
 
-#include "vdpau/vdpau.h"
-#include "vdpau/vdpau_x11.h"
+#include <vdpau/vdpau.h>
+#include <vdpau/vdpau_x11.h>
 
 /** \brief The videoSurface is used for rendering. */
 #define FF_VDPAU_STATE_USED_FOR_RENDER 1
@@ -71,12 +71,14 @@ struct vdpau_render_state {
     /** picture parameter information for all supported codecs */
     union VdpPictureInfo {
         VdpPictureInfoH264     h264;
+        VdpPictureInfoMPEG1Or2 mpeg;
+        VdpPictureInfoVC1       vc1;
     } info;
 
     /** Describe size/location of the compressed video data. */
-    int bitstreamBuffersAllocated;
-    int bitstreamBuffersUsed;
-    VdpBitstreamBuffer *bitstreamBuffers;
+    int bitstream_buffers_allocated;
+    int bitstream_buffers_used;
+    VdpBitstreamBuffer *bitstream_buffers;
 };
 
 /* @}*/