diff options
| author | James Almer <jamrial@gmail.com> | 2016-06-26 15:14:17 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2016-06-26 15:14:17 -0300 |
| commit | 104c357b6a3ee181e1d657df68e38c17ba2bda77 (patch) | |
| tree | 8de7acbcf90609e153169a3d0c65eba46b93b15c /libavcodec/rv34.c | |
| parent | b2a74dd629c1ab3318ba0123f8814797a4fea3a4 (diff) | |
| parent | e9394ca63dab3434bc8e869de019ecd86cb604ac (diff) | |
| download | ffmpeg-104c357b6a3ee181e1d657df68e38c17ba2bda77.tar.gz | |
Merge branch 'master' into release/3.1
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/rv34.c')
| -rw-r--r-- | libavcodec/rv34.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c index 18f1de734e..aca8382f20 100644 --- a/libavcodec/rv34.c +++ b/libavcodec/rv34.c @@ -864,8 +864,8 @@ static int rv34_decode_mv(RV34DecContext *r, int block_type) memset(r->dmv, 0, sizeof(r->dmv)); for(i = 0; i < num_mvs[block_type]; i++){ - r->dmv[i][0] = svq3_get_se_golomb(gb); - r->dmv[i][1] = svq3_get_se_golomb(gb); + r->dmv[i][0] = get_interleaved_se_golomb(gb); + r->dmv[i][1] = get_interleaved_se_golomb(gb); } switch(block_type){ case RV34_MB_TYPE_INTRA: |