diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-03 01:18:24 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-03 01:18:24 +0200 |
| commit | fb09531720a4aa2dfa97e5a9a246a453b6278fd2 (patch) | |
| tree | 61525c3a8ddb419d3838a26e488fc3659079bbcd /contrib/ffmpeg/libavformat/rm.c | |
| parent | 294d01046724e28b7193bcb65bf2a0391b0135b6 (diff) | |
| download | xine-lib-fb09531720a4aa2dfa97e5a9a246a453b6278fd2.tar.gz xine-lib-fb09531720a4aa2dfa97e5a9a246a453b6278fd2.tar.bz2 | |
Sync with a more recent version of FFmpeg.
Diffstat (limited to 'contrib/ffmpeg/libavformat/rm.c')
| -rw-r--r-- | contrib/ffmpeg/libavformat/rm.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/contrib/ffmpeg/libavformat/rm.c b/contrib/ffmpeg/libavformat/rm.c index b4ddf1b02..ad2f5ff27 100644 --- a/contrib/ffmpeg/libavformat/rm.c +++ b/contrib/ffmpeg/libavformat/rm.c @@ -954,9 +954,8 @@ resync: len=len2; rm->remaining_len-= len; av_get_packet(pb, pkt, len); - } - if (st->codec->codec_type == CODEC_TYPE_AUDIO) { + } else if (st->codec->codec_type == CODEC_TYPE_AUDIO) { if ((st->codec->codec_id == CODEC_ID_RA_288) || (st->codec->codec_id == CODEC_ID_COOK)) { int x; @@ -1008,7 +1007,9 @@ resync: } } else av_get_packet(pb, pkt, len); - } + + } else + av_get_packet(pb, pkt, len); if( (st->discard >= AVDISCARD_NONKEY && !(flags&2)) || st->discard >= AVDISCARD_ALL){ |