diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 05:49:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-17 05:51:27 +0100 |
| commit | c237e88d51b9da12026734101a9ba578d04b4b15 (patch) | |
| tree | 4619fc3624a92400ad92ee2b61e42f3678037a67 /libavcodec/h264_direct.c | |
| parent | 4f22e39e65e9e4705845fb091a05ca4526eb835a (diff) | |
| parent | 9b749c8274f6b6f35dde2cf29b99fa4f719abf87 (diff) | |
| download | ffmpeg-c237e88d51b9da12026734101a9ba578d04b4b15.tar.gz | |
Merge commit '9b749c8274f6b6f35dde2cf29b99fa4f719abf87'
* commit '9b749c8274f6b6f35dde2cf29b99fa4f719abf87':
h264: move relevant fields from Picture to H264Picture
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_direct.c')
| -rw-r--r-- | libavcodec/h264_direct.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c index 477359c8ff..4ed86daaeb 100644 --- a/libavcodec/h264_direct.c +++ b/libavcodec/h264_direct.c @@ -67,7 +67,7 @@ void ff_h264_direct_dist_scale_factor(H264Context * const h){ } static void fill_colmap(H264Context *h, int map[2][16+32], int list, int field, int colfield, int mbafi){ - Picture * const ref1 = &h->ref_list[1][0]; + H264Picture * const ref1 = &h->ref_list[1][0]; int j, old_ref, rfield; int start= mbafi ? 16 : 0; int end = mbafi ? 16+2*h->ref_count[0] : h->ref_count[0]; @@ -100,8 +100,8 @@ static void fill_colmap(H264Context *h, int map[2][16+32], int list, int field, } void ff_h264_direct_ref_list_init(H264Context * const h){ - Picture * const ref1 = &h->ref_list[1][0]; - Picture * const cur = h->cur_pic_ptr; + H264Picture * const ref1 = &h->ref_list[1][0]; + H264Picture * const cur = h->cur_pic_ptr; int list, j, field; int sidx= (h->picture_structure&1)^1; int ref1sidx = (ref1->reference&1)^1; @@ -140,7 +140,7 @@ void ff_h264_direct_ref_list_init(H264Context * const h){ } } -static void await_reference_mb_row(H264Context * const h, Picture *ref, int mb_y) +static void await_reference_mb_row(H264Context * const h, H264Picture *ref, int mb_y) { int ref_field = ref->reference - 1; int ref_field_picture = ref->field_picture; |