Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-01-18 22:52:25 +0300
committerMichael Niedermayer <michaelni@gmx.at>2015-01-18 22:53:25 +0300
commit8d7ce5cdb707d4b22749f72d3f118e62e2b95cd3 (patch)
treed7b0c8f4fcd70b03a975e0e1dfee684827f5f051 /libavformat/nsvdec.c
parenteba5cb2028f162f2850ba83713601349619e6da1 (diff)
avformat/nsvdec: Check the return value of av_get_packet()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/nsvdec.c')
-rw-r--r--libavformat/nsvdec.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/nsvdec.c b/libavformat/nsvdec.c
index f479d1e5aa..f3a26c6049 100644
--- a/libavformat/nsvdec.c
+++ b/libavformat/nsvdec.c
@@ -539,6 +539,7 @@ static int nsv_read_chunk(AVFormatContext *s, int fill_header)
uint32_t vsize;
uint16_t asize;
uint16_t auxsize;
+ int ret;
av_dlog(s, "%s(%d)\n", __FUNCTION__, fill_header);
@@ -595,7 +596,6 @@ null_chunk_retry:
st[s->streams[1]->id] = s->streams[1];
if (vsize && st[NSV_ST_VIDEO]) {
- int ret;
nst = st[NSV_ST_VIDEO]->priv_data;
pkt = &nsv->ahead[NSV_ST_VIDEO];
if ((ret = av_get_packet(pb, pkt, vsize)) < 0)
@@ -641,7 +641,8 @@ null_chunk_retry:
av_dlog(s, "NSV RAWAUDIO: bps %d, nchan %d, srate %d\n", bps, channels, samplerate);
}
}
- av_get_packet(pb, pkt, asize);
+ if ((ret = av_get_packet(pb, pkt, asize)) < 0)
+ return ret;
pkt->stream_index = st[NSV_ST_AUDIO]->index;//NSV_ST_AUDIO;
pkt->flags |= nsv->state == NSV_HAS_READ_NSVS ? AV_PKT_FLAG_KEY : 0; /* keyframe only likely on a sync frame */
if( nsv->state == NSV_HAS_READ_NSVS && st[NSV_ST_VIDEO] ) {