RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-03-01 18:21:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer 2012-12-18 15:00:05 +01:00
commit 5c2fc3bdd7
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure vendored
View File

@ -2229,13 +2229,17 @@ do_random(){
for opt do for opt do
optval="${opt#*=}" optval="${opt#*=}"
case "$opt" in case "$opt" in
--extra-ldflags=*) add_ldflags $optval --extra-ldflags=*)
add_ldflags $optval
;; ;;
--extra-libs=*) add_extralibs $optval --extra-libs=*)
add_extralibs $optval
;; ;;
--disable-devices) disable $INDEV_LIST $OUTDEV_LIST --disable-devices)
disable $INDEV_LIST $OUTDEV_LIST
;; ;;
--enable-debug=*) debuglevel="$optval" --enable-debug=*)
debuglevel="$optval"
;; ;;
--disable-programs) --disable-programs)
disable $PROGRAM_LIST disable $PROGRAM_LIST

4
libavcodec/h264_direct.c
View File

@ -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++){ for(j=start; j<end; j++){
if (4 * h->ref_list[0][j].frame_num + (h->ref_list[0][j].f.reference & 3) == poc) { 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; int cur_ref= mbafi ? (j-16)^field : j;
if(ref1->mbaff) if (ref1->mbaff)
map[list][2*old_ref + (rfield^field) + 16] = cur_ref; map[list][2 * old_ref + (rfield^field) + 16] = cur_ref;
if(rfield == field || !interl) if(rfield == field || !interl)
map[list][old_ref] = cur_ref; map[list][old_ref] = cur_ref;
break; break;