diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2006-02-05 14:11:16 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2006-02-05 14:11:16 +0000 |
| commit | 40c9e400fdaf1e9bb49eb0d0f0e437025b0ab6e8 (patch) | |
| tree | 0a0d683a843d5d50b12233116b777e8e2780cad9 /src/libffmpeg/libavcodec/roqvideo.c | |
| parent | 9a299a12ea17a363354f451d2efd15bfbf3c7dc6 (diff) | |
| download | xine-lib-40c9e400fdaf1e9bb49eb0d0f0e437025b0ab6e8.tar.gz xine-lib-40c9e400fdaf1e9bb49eb0d0f0e437025b0ab6e8.tar.bz2 | |
ffmpeg sync
CVS patchset: 7872
CVS date: 2006/02/05 14:11:16
Diffstat (limited to 'src/libffmpeg/libavcodec/roqvideo.c')
| -rw-r--r-- | src/libffmpeg/libavcodec/roqvideo.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libffmpeg/libavcodec/roqvideo.c b/src/libffmpeg/libavcodec/roqvideo.c index 598765583..462a4cf72 100644 --- a/src/libffmpeg/libavcodec/roqvideo.c +++ b/src/libffmpeg/libavcodec/roqvideo.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ @@ -255,7 +255,7 @@ static void apply_motion_8x8(RoqContext *ri, int x, int y, pa[2] = avg2(pb[2], pb[3]); pa[3] = avg2(pb[3], pb[4]); break; - + case 2: pa[0] = avg2(pb[0], pb[hw]); pa[1] = avg2(pb[1], pb[hw+1]); @@ -362,7 +362,7 @@ static void roqvideo_decode_frame(RoqContext *ri) apply_motion_4x4(ri, x, y, 0, 8, 8); break; case RoQ_ID_FCC: - apply_motion_4x4(ri, x, y, buf[bpos++], + apply_motion_4x4(ri, x, y, buf[bpos++], chunk_arg >> 8, chunk_arg & 0xff); break; case RoQ_ID_SLD: |