aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2015-01-27 14:25:01 +0100
committerAnton Khirnov <anton@khirnov.net>2015-03-21 11:27:14 +0100
commit2ea00e35e4e0b58f7a306dd55d8f72a21c32c946 (patch)
tree4e430bc38f5992a5eac311f05036f3403f08ea82 /libavcodec
parent404a416d4b1fcbf9db5569481d8181f296c01ea9 (diff)
downloadffmpeg-2ea00e35e4e0b58f7a306dd55d8f72a21c32c946.tar.gz
h264: do not abuse the context as a temporary storage in get_last_needed_nal()
Use a local variable instead.
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/h264.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index a2e3e0156f..6b728077e7 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -1372,6 +1372,7 @@ static int get_last_needed_nal(H264Context *h, const uint8_t *buf, int buf_size)
int nals_needed = 0;
while(1) {
+ GetBitContext gb;
int nalsize = 0;
int dst_length, bit_length, consumed;
const uint8_t *ptr;
@@ -1411,8 +1412,8 @@ static int get_last_needed_nal(H264Context *h, const uint8_t *buf, int buf_size)
case NAL_DPA:
case NAL_IDR_SLICE:
case NAL_SLICE:
- init_get_bits(&h->gb, ptr, bit_length);
- if (!get_ue_golomb(&h->gb))
+ init_get_bits(&gb, ptr, bit_length);
+ if (!get_ue_golomb(&gb))
nals_needed = nal_index;
}
}