Commit a7a12100 authored by aurel's avatar aurel

add a temporary variable to simplify the code

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@12415 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 2c1bb9e0
...@@ -2380,6 +2380,7 @@ matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data, int size, ...@@ -2380,6 +2380,7 @@ matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data, int size,
uint32_t *lace_size = NULL; uint32_t *lace_size = NULL;
int n, flags, laces = 0; int n, flags, laces = 0;
uint64_t num; uint64_t num;
int stream_index;
/* first byte(s): tracknum */ /* first byte(s): tracknum */
if ((n = matroska_ebmlnum_uint(data, size, &num)) < 0) { if ((n = matroska_ebmlnum_uint(data, size, &num)) < 0) {
...@@ -2398,11 +2399,12 @@ matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data, int size, ...@@ -2398,11 +2399,12 @@ matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data, int size,
av_free(origdata); av_free(origdata);
return res; return res;
} }
if (matroska->tracks[track]->stream_index < 0) { stream_index = matroska->tracks[track]->stream_index;
if (stream_index < 0) {
av_free(origdata); av_free(origdata);
return res; return res;
} }
st = matroska->ctx->streams[matroska->tracks[track]->stream_index]; st = matroska->ctx->streams[stream_index];
if (st->discard >= AVDISCARD_ALL) { if (st->discard >= AVDISCARD_ALL) {
av_free(origdata); av_free(origdata);
return res; return res;
...@@ -2545,7 +2547,7 @@ matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data, int size, ...@@ -2545,7 +2547,7 @@ matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data, int size,
memcpy(pkt->data, audiotrack->buf memcpy(pkt->data, audiotrack->buf
+ a * (h*w / a - audiotrack->pkt_cnt--), a); + a * (h*w / a - audiotrack->pkt_cnt--), a);
pkt->pos = pos; pkt->pos = pos;
pkt->stream_index = matroska->tracks[track]->stream_index; pkt->stream_index = stream_index;
matroska_queue_packet(matroska, pkt); matroska_queue_packet(matroska, pkt);
} }
} else { } else {
...@@ -2562,7 +2564,7 @@ matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data, int size, ...@@ -2562,7 +2564,7 @@ matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data, int size,
if (n == 0) if (n == 0)
pkt->flags = is_keyframe; pkt->flags = is_keyframe;
pkt->stream_index = matroska->tracks[track]->stream_index; pkt->stream_index = stream_index;
pkt->pts = timecode; pkt->pts = timecode;
pkt->pos = pos; pkt->pos = pos;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment