qsvdec: only access hwaccel_context is the pixel format is QSV

[ffmpeg] / libavcodec / svq1.h

diff --git a/libavcodec/svq1.h b/libavcodec/svq1.h
index 066ea47fb6d21ab8521cdc9073506e6e17e4b798..988a0a098d22cad3dd66dffad58554340fa3b9d0 100644 (file)
--- a/libavcodec/svq1.h
+++ b/libavcodec/svq1.h
@@ -4,7 +4,7 @@
  * ported to libavcodec by Nick Kurshev <nickols_k@mail.ru>
  *
  * Copyright (C) 2002 the xine project
- * Copyright (C) 2002 the ffmpeg project
+ * Copyright (C) 2002 The FFmpeg project
  *
  * SVQ1 Encoder (c) 2004 Mike Melanson <melanson@pcisys.net>
  *
@@ -42,16 +42,11 @@
 #define SVQ1_BLOCK_INTER_4V     2
 #define SVQ1_BLOCK_INTRA        3
 
-struct svq1_frame_size {
-    uint16_t width;
-    uint16_t height;
-};
+uint16_t ff_svq1_packet_checksum(const uint8_t *data,
+                                 const int length, int value);
 
-uint16_t ff_svq1_packet_checksum (const uint8_t *data, const int length,
-                                  int value);
-
-extern const int8_t* const ff_svq1_inter_codebooks[6];
-extern const int8_t* const ff_svq1_intra_codebooks[6];
+extern const int8_t *const ff_svq1_inter_codebooks[6];
+extern const int8_t *const ff_svq1_intra_codebooks[6];
 
 extern const uint8_t ff_svq1_block_type_vlc[4][2];
 extern const uint8_t ff_svq1_intra_multistage_vlc[6][8][2];
@@ -59,6 +54,6 @@ extern const uint8_t ff_svq1_inter_multistage_vlc[6][8][2];
 extern const uint16_t ff_svq1_intra_mean_vlc[256][2];
 extern const uint16_t ff_svq1_inter_mean_vlc[512][2];
 
-extern const struct svq1_frame_size ff_svq1_frame_size_table[7];
+extern const uint16_t ff_svq1_frame_size_table[7][2];
 
 #endif /* AVCODEC_SVQ1_H */