diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-06 22:54:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-06 22:54:00 +0200 |
| commit | a3ba542af39ba4425cbb44d2a0ae09c212b40001 (patch) | |
| tree | acb6372b0ee48a4fb6aa5fe06b884d08ee412684 /libavcodec/h264_direct.c | |
| parent | 481747c6f74c7e17fcefc9341533f90b6fc8cd5b (diff) | |
| download | ffmpeg-a3ba542af39ba4425cbb44d2a0ae09c212b40001.tar.gz | |
h264: fix fill_colmap() to not store entries mbaff style when the reference is not mbaff at all
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_direct.c')
| -rw-r--r-- | libavcodec/h264_direct.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c index ab9592bcea..abc0700945 100644 --- a/libavcodec/h264_direct.c +++ b/libavcodec/h264_direct.c @@ -89,7 +89,8 @@ static void fill_colmap(H264Context *h, int map[2][16+32], int list, int field, for(j=start; j<end; j++){ if (4 * h->ref_list[0][j].frame_num + (h->ref_list[0][j].f.reference & 3) == poc) { int cur_ref= mbafi ? (j-16)^field : j; - map[list][2*old_ref + (rfield^field) + 16] = cur_ref; + if(ref1->mbaff) + map[list][2*old_ref + (rfield^field) + 16] = cur_ref; if(rfield == field || !interl) map[list][old_ref] = cur_ref; break; |