Fix r21223: AVup samples (issue 1685) need a buf offset like AV1x (issue 1684).

[ffmpeg] / libavcodec / tiff.h

diff --git a/libavcodec/tiff.h b/libavcodec/tiff.h
index 4e51de24d3ad0d831943eec3fc8b0dbd49ba5adb..17c65b921c3f673ae27b81fb12c28248e5eb9f99 100644 (file)
--- a/libavcodec/tiff.h
+++ b/libavcodec/tiff.h
@@ -17,16 +17,17 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 
 /**
  * TIFF tables
- * @file tiff.h
+ * @file libavcodec/tiff.h
  * @author Konstantin Shishkov
  */
-#ifndef TIFF_H
-#define TIFF_H
+#ifndef AVCODEC_TIFF_H
+#define AVCODEC_TIFF_H
+
+#include <stdint.h>
 
 /** abridged list of TIFF tags */
 enum TiffTags{
@@ -36,6 +37,7 @@ enum TiffTags{
     TIFF_BPP,
     TIFF_COMPR,
     TIFF_INVERT = 0x106,
+    TIFF_FILL_ORDER = 0x10A,
     TIFF_STRIP_OFFS = 0x111,
     TIFF_SAMPLES_PER_PIXEL = 0x115,
     TIFF_ROWSPERSTRIP = 0x116,
@@ -45,6 +47,8 @@ enum TiffTags{
     TIFF_PLANAR = 0x11C,
     TIFF_XPOS = 0x11E,
     TIFF_YPOS = 0x11F,
+    TIFF_T4OPTIONS = 0x124,
+    TIFF_T6OPTIONS,
     TIFF_RES_UNIT = 0x128,
     TIFF_SOFTWARE_NAME = 0x131,
     TIFF_PREDICTOR = 0x13D,
@@ -82,4 +86,4 @@ static const uint8_t type_sizes[6] = {
     0, 1, 100, 2, 4, 8
 };
 
-#endif                          /* TIFF_H */
+#endif /* AVCODEC_TIFF_H */