mov_read_packet: if dv_get_packet fails, return exactly its error value
instead of always -1 (makes no real difference currently since dv_get_packet always returns -1 so far). Originally committed as revision 19262 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
69fc436cbc
commit
a2f3851166
@ -2107,8 +2107,9 @@ static int mov_read_packet(AVFormatContext *s, AVPacket *pkt)
|
|||||||
dv_produce_packet(mov->dv_demux, pkt, pkt->data, pkt->size);
|
dv_produce_packet(mov->dv_demux, pkt, pkt->data, pkt->size);
|
||||||
av_free(pkt->data);
|
av_free(pkt->data);
|
||||||
pkt->size = 0;
|
pkt->size = 0;
|
||||||
if (dv_get_packet(mov->dv_demux, pkt) < 0)
|
ret = dv_get_packet(mov->dv_demux, pkt);
|
||||||
return -1;
|
if (ret < 0)
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
pkt->stream_index = sc->ffindex;
|
pkt->stream_index = sc->ffindex;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user