Reindent after last patch.
Originally committed as revision 19265 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
3fe4d5d4e6
commit
e1c1b0ff09
@ -2104,23 +2104,23 @@ static int mov_read_packet(AVFormatContext *s, AVPacket *pkt)
|
|||||||
sc->current_sample++;
|
sc->current_sample++;
|
||||||
|
|
||||||
if (st->discard != AVDISCARD_ALL) {
|
if (st->discard != AVDISCARD_ALL) {
|
||||||
if (url_fseek(sc->pb, sample->pos, SEEK_SET) != sample->pos) {
|
if (url_fseek(sc->pb, sample->pos, SEEK_SET) != sample->pos) {
|
||||||
av_log(mov->fc, AV_LOG_ERROR, "stream %d, offset 0x%"PRIx64": partial file\n",
|
av_log(mov->fc, AV_LOG_ERROR, "stream %d, offset 0x%"PRIx64": partial file\n",
|
||||||
sc->ffindex, sample->pos);
|
sc->ffindex, sample->pos);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
ret = av_get_packet(sc->pb, pkt, sample->size);
|
ret = av_get_packet(sc->pb, pkt, sample->size);
|
||||||
if (ret < 0)
|
|
||||||
return ret;
|
|
||||||
#if CONFIG_DV_DEMUXER
|
|
||||||
if (mov->dv_demux && sc->dv_audio_container) {
|
|
||||||
dv_produce_packet(mov->dv_demux, pkt, pkt->data, pkt->size);
|
|
||||||
av_free(pkt->data);
|
|
||||||
pkt->size = 0;
|
|
||||||
ret = dv_get_packet(mov->dv_demux, pkt);
|
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
#if CONFIG_DV_DEMUXER
|
||||||
|
if (mov->dv_demux && sc->dv_audio_container) {
|
||||||
|
dv_produce_packet(mov->dv_demux, pkt, pkt->data, pkt->size);
|
||||||
|
av_free(pkt->data);
|
||||||
|
pkt->size = 0;
|
||||||
|
ret = dv_get_packet(mov->dv_demux, pkt);
|
||||||
|
if (ret < 0)
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user