diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2010-02-15 01:24:50 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2010-02-15 01:24:50 +0000 |
| commit | cbfcde9f5213375c46510138e92fb4fe3fd95649 (patch) | |
| tree | f94e7232e9125113afb4e30a475c264ddff1b595 /libavcodec | |
| parent | 64dd1b0a1d2621f8670efcbc9f12b00bf0e3d307 (diff) | |
| download | ffmpeg-cbfcde9f5213375c46510138e92fb4fe3fd95649.tar.gz | |
10l use pack16to32(), should fix big endian h264 failures.
Originally committed as revision 21829 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -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 1d8a8ba08c..1253fcd211 100644 --- a/libavcodec/h264_direct.c +++ b/libavcodec/h264_direct.c @@ -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 - 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]){ |