avformat/oggparsevorbis: check packet size before reading new_len from it

[ffmpeg] / libavcodec / bit_depth_template.c

diff --git a/libavcodec/bit_depth_template.c b/libavcodec/bit_depth_template.c
index 96f5edec0f7c094ca56b2f015dbd0be8a8aa566c..56c2935a245d3aafa7ae0d117e804038aef59941 100644 (file)
--- a/libavcodec/bit_depth_template.c
+++ b/libavcodec/bit_depth_template.c
@@ -23,7 +23,7 @@
 #define BIT_DEPTH 8
 #endif
 
-#ifdef AVCODEC_H264_HIGH_DEPTH_H
+#ifdef AVCODEC_BIT_DEPTH_TEMPLATE_C
 #   undef pixel
 #   undef pixel2
 #   undef pixel4
@@ -43,7 +43,7 @@
 #   undef av_clip_pixel
 #   undef PIXEL_SPLAT_X4
 #else
-#   define AVCODEC_H264_HIGH_DEPTH_H
+#   define AVCODEC_BIT_DEPTH_TEMPLATE_C
 #endif
 
 #if BIT_DEPTH > 8