diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2008-12-13 21:37:27 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2008-12-13 21:37:27 +0000 |
| commit | a15ebf34c77c7c93aef70caeeace538f47eaab8a (patch) | |
| tree | 2ed9198c79fd39059ad3c627030aa3ea08fabb6f /libavformat/rmdec.c | |
| parent | 616deed28f0626a98022837488b222aa158ce3b4 (diff) | |
| download | ffmpeg-a15ebf34c77c7c93aef70caeeace538f47eaab8a.tar.gz | |
Don't access RMContext directly in rdt.c. Rather, use the return value of
ff_rm_parse_packet() to indicate whether more audio packets are available
in the demuxer from the last RM frame, and save that in the RDT parsing
context. See patch/discussion in "[PATCH] rdt.c: don't access RMContext"
on ML.
Originally committed as revision 16110 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/rmdec.c')
| -rw-r--r-- | libavformat/rmdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rmdec.c b/libavformat/rmdec.c index ea4cf809e9..440443c01d 100644 --- a/libavformat/rmdec.c +++ b/libavformat/rmdec.c @@ -644,7 +644,7 @@ ff_rm_parse_packet (AVFormatContext *s, ByteIOContext *pb, if (*flags & 2) pkt->flags |= PKT_FLAG_KEY; - return 0; + return st->codec->codec_type == CODEC_TYPE_AUDIO ? rm->audio_pkt_cnt : 0; } void |