Mercurial > libavformat.hg
comparison mov.c @ 5062:8d81bf3822ac libavformat
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).
author | reimar |
---|---|
date | Wed, 24 Jun 2009 08:50:46 +0000 |
parents | 5ff6a72c9686 |
children | dcaea581e24d |
comparison
equal
deleted
inserted
replaced
5061:5ff6a72c9686 | 5062:8d81bf3822ac |
---|---|
2105 #if CONFIG_DV_DEMUXER | 2105 #if CONFIG_DV_DEMUXER |
2106 if (mov->dv_demux && sc->dv_audio_container) { | 2106 if (mov->dv_demux && sc->dv_audio_container) { |
2107 dv_produce_packet(mov->dv_demux, pkt, pkt->data, pkt->size); | 2107 dv_produce_packet(mov->dv_demux, pkt, pkt->data, pkt->size); |
2108 av_free(pkt->data); | 2108 av_free(pkt->data); |
2109 pkt->size = 0; | 2109 pkt->size = 0; |
2110 if (dv_get_packet(mov->dv_demux, pkt) < 0) | 2110 ret = dv_get_packet(mov->dv_demux, pkt); |
2111 return -1; | 2111 if (ret < 0) |
2112 return ret; | |
2112 } | 2113 } |
2113 #endif | 2114 #endif |
2114 pkt->stream_index = sc->ffindex; | 2115 pkt->stream_index = sc->ffindex; |
2115 pkt->dts = sample->timestamp; | 2116 pkt->dts = sample->timestamp; |
2116 if (sc->ctts_data) { | 2117 if (sc->ctts_data) { |