diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-18 15:00:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-18 15:00:05 +0100 |
| commit | 5c2fc3bdd7f6da1c12f731419cd60037e9c3c2a4 (patch) | |
| tree | 1a966b26141c8815e0ae89153ce8d4c828d51728 /libavcodec/h264_direct.c | |
| parent | 14f79ba18f263a746f91dbd80f4d109fb16105ca (diff) | |
| parent | ea061af15ac5629dc8dbeb33b7382d6711a323c3 (diff) | |
| download | android_external_ffmpeg-5c2fc3bdd7f6da1c12f731419cd60037e9c3c2a4.tar.gz android_external_ffmpeg-5c2fc3bdd7f6da1c12f731419cd60037e9c3c2a4.tar.bz2 android_external_ffmpeg-5c2fc3bdd7f6da1c12f731419cd60037e9c3c2a4.zip | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: formatting cosmetics
h264: use mbaff ref indices in fill_colmap() only for mbaff references
Conflicts:
libavcodec/h264_direct.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_direct.c')
| -rw-r--r-- | libavcodec/h264_direct.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c index 9ef5862472..1373e23eb4 100644 --- a/libavcodec/h264_direct.c +++ b/libavcodec/h264_direct.c @@ -89,8 +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; - if(ref1->mbaff) - 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; |