diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-06-26 15:12:48 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-06-26 15:12:48 +0200 |
| commit | b20fe650ef856006b50bbd767a39e19a8a6319f8 (patch) | |
| tree | 12b60fd9a8960a113e30a566b54c2b3f9e43738c /libavformat | |
| parent | 324f0fbff1245f9e9e1dda29ecb03138a2de287d (diff) | |
| parent | 4024b566d664a4b161d677554be52f32e7ad4236 (diff) | |
| download | ffmpeg-b20fe650ef856006b50bbd767a39e19a8a6319f8.tar.gz | |
Merge commit '4024b566d664a4b161d677554be52f32e7ad4236'
* commit '4024b566d664a4b161d677554be52f32e7ad4236':
golomb: Give svq3_get_se_golomb()/svq3_get_ue_golomb() better names
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/rtpenc_vc2hq.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libavformat/rtpenc_vc2hq.c b/libavformat/rtpenc_vc2hq.c index deda62183a..085204fa64 100644 --- a/libavformat/rtpenc_vc2hq.c +++ b/libavformat/rtpenc_vc2hq.c @@ -60,19 +60,19 @@ static void send_picture(AVFormatContext *ctx, const uint8_t *buf, int size, int second_field = interlaced && (pic_nr & 0x01); init_get_bits(&gc, buf, 8 * size); - svq3_get_ue_golomb(&gc); /* wavelet_idx */ - wavelet_depth = svq3_get_ue_golomb(&gc); - svq3_get_ue_golomb(&gc); /* num_x */ - svq3_get_ue_golomb(&gc); /* num_y */ - prefix_bytes = svq3_get_ue_golomb(&gc); - size_scaler = svq3_get_ue_golomb(&gc); + get_interleaved_ue_golomb(&gc); /* wavelet_idx */ + wavelet_depth = get_interleaved_ue_golomb(&gc); + get_interleaved_ue_golomb(&gc); /* num_x */ + get_interleaved_ue_golomb(&gc); /* num_y */ + prefix_bytes = get_interleaved_ue_golomb(&gc); + size_scaler = get_interleaved_ue_golomb(&gc); /* pass the quantization matrices */ - svq3_get_ue_golomb(&gc); + get_interleaved_ue_golomb(&gc); for(lvl = 0; lvl < wavelet_depth; lvl++) { - svq3_get_ue_golomb(&gc); - svq3_get_ue_golomb(&gc); - svq3_get_ue_golomb(&gc); + get_interleaved_ue_golomb(&gc); + get_interleaved_ue_golomb(&gc); + get_interleaved_ue_golomb(&gc); } frag_len = (get_bits_count(&gc) + 7) / 8; /* length of transform parameters */ |