summaryrefslogtreecommitdiffstats
path: root/libavcodec/h264.h
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2015-01-17 22:28:46 +0100
committerAnton Khirnov <anton@khirnov.net>2015-03-21 11:27:13 +0100
commit066aafced4dc6c7c9e7b37082635472249f1e93e (patch)
tree86888b90a0078a5fa65a3af3e7ddd07869c7cfc0 /libavcodec/h264.h
parented451a08a46b2b07fd2dba3e55ffddd18ae6e3d6 (diff)
downloadffmpeg-streaming-066aafced4dc6c7c9e7b37082635472249f1e93e.zip
ffmpeg-streaming-066aafced4dc6c7c9e7b37082635472249f1e93e.tar.gz
h264: move direct_spatial_mv_pred into the per-slice context
Diffstat (limited to 'libavcodec/h264.h')
-rw-r--r--libavcodec/h264.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index 6cd30e8..a259a97 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -355,6 +355,8 @@ typedef struct H264SliceContext {
*/
int neighbor_transform_size;
+ int direct_spatial_mv_pred;
+
/**
* non zero coeff count cache.
* is 64 if not available.
@@ -440,7 +442,6 @@ typedef struct H264Context {
int picture_structure;
int first_field;
- int direct_spatial_mv_pred;
int col_parity;
int col_fieldoff;
int dist_scale_factor[32];
OpenPOWER on IntegriCloud