Index: ffmpeg/source/patched-ffmpeg/libavcodec/vp8.h |
diff --git a/ffmpeg/source/patched-ffmpeg/libavcodec/vp8.h b/ffmpeg/source/patched-ffmpeg/libavcodec/vp8.h |
index 468e28e8d5d2d289c718a931dfcbfd3d02b1c8d6..36c21df2175add978136740187364ba1e3336096 100644 |
--- a/ffmpeg/source/patched-ffmpeg/libavcodec/vp8.h |
+++ b/ffmpeg/source/patched-ffmpeg/libavcodec/vp8.h |
@@ -130,7 +130,6 @@ typedef struct { |
uint8_t *intra4x4_pred_mode_top; |
uint8_t intra4x4_pred_mode_left[4]; |
- uint8_t *segmentation_map; |
/** |
* Macroblocks can have one of 4 different quants in a frame when |
@@ -237,6 +236,16 @@ typedef struct { |
H264PredContext hpc; |
vp8_mc_func put_pixels_tab[3][3][3]; |
AVFrame frames[5]; |
+ |
+ /** |
+ * A list of segmentation_map buffers that are to be free()'ed in |
+ * the next decoding iteration. We can't free() them right away |
+ * because the map may still be used by subsequent decoding threads. |
+ * Unused if frame threading is off. |
+ */ |
+ uint8_t *segmentation_maps[5]; |
+ int num_maps_to_be_freed; |
+ int maps_are_invalid; |
} VP8Context; |
#endif /* AVCODEC_VP8_H */ |