10l use pack16to32(), should fix big endian h264 failures.
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 15 Feb 2010 01:24:50 +0000 (01:24 +0000)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 15 Feb 2010 01:24:50 +0000 (01:24 +0000)
Originally committed as revision 21829 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/h264_direct.c

index 1d8a8ba..1253fcd 100644 (file)
@@ -178,8 +178,8 @@ static void pred_spatial_direct_motion(H264Context * const h, int *mb_type){
 
             int match_count= (left_ref==ref[list]) + (top_ref==ref[list]) + (refc==ref[list]);
             if(match_count > 1){ //most common
 
             int match_count= (left_ref==ref[list]) + (top_ref==ref[list]) + (refc==ref[list]);
             if(match_count > 1){ //most common
-                mv[list]= (mid_pred(A[0], B[0], C[0])&0xFFFF)
-                         +(mid_pred(A[1], B[1], C[1])<<16);
+                mv[list]= pack16to32(mid_pred(A[0], B[0], C[0]),
+                                     mid_pred(A[1], B[1], C[1]) );
             }else {
                 assert(match_count==1);
                 if(left_ref==ref[list]){
             }else {
                 assert(match_count==1);
                 if(left_ref==ref[list]){