summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>2009-06-24 09:40:00 +0000
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>2009-06-24 09:40:00 +0000
commite1c1b0ff09ddf4cf8a915441883cbc33cd0c61fe (patch)
tree5a19470e0049707e3fb5dbbda45dbd7b6054b050 /libavformat
parent3fe4d5d4e655977750afce0e5dd1bd8fb6422201 (diff)
Reindent after last patch.
Originally committed as revision 19265 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/mov.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 593a4221d8..a5583495c2 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -2104,23 +2104,23 @@ static int mov_read_packet(AVFormatContext *s, AVPacket *pkt)
sc->current_sample++;
if (st->discard != AVDISCARD_ALL) {
- 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",
- sc->ffindex, sample->pos);
- return -1;
- }
- 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 (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",
+ sc->ffindex, sample->pos);
+ return -1;
+ }
+ 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)
+ return ret;
+ }
#endif
}