diff options
author | Ronald S. Bultje <rsbultje@gmail.com> | 2009-07-30 15:04:19 +0000 |
---|---|---|
committer | Ronald S. Bultje <rsbultje@gmail.com> | 2009-07-30 15:04:19 +0000 |
commit | 34bddc39b4c3af9472c99a9835af4dc12160f48e (patch) | |
tree | fde342f16cafe124db5cbd6c930ce88de93d7b17 /libavformat/rm.h | |
parent | e4b8d05d476f34d1b5daba87db190cc06cea5805 (diff) | |
download | ffmpeg-34bddc39b4c3af9472c99a9835af4dc12160f48e.tar.gz |
Don't use a pointer-to-flags/timestamp in ff_rm_parse_packet(); the function
used to return packet data, which might update the flags/timestamp to be
used for the next packet data returned by the demuxer. However, that was
separated out into a new function, and the flags/timestamp are thus never
updated within ff_rm_parse_packet() anymore, and thus do not need to be
a pointer.
Originally committed as revision 19539 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/rm.h')
-rw-r--r-- | libavformat/rm.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libavformat/rm.h b/libavformat/rm.h index 8bb32bf701..a60004883a 100644 --- a/libavformat/rm.h +++ b/libavformat/rm.h @@ -61,16 +61,15 @@ int ff_rm_read_mdpr_codecdata (AVFormatContext *s, ByteIOContext *pb, * @param pkt packet location to store the parsed packet data * @param seq pointer to an integer containing the sequence number, may be * updated - * @param flags pointer to an integer containing the packet flags, may be - updated - * @param ts pointer to timestamp, may be updated + * @param flags the packet flags + * @param ts timestamp of the current packet * @return <0 on error, 0 if a packet was placed in the pkt pointer. A * value >0 means that no data was placed in pkt, but that cached * data is available by calling ff_rm_retrieve_cache(). */ int ff_rm_parse_packet (AVFormatContext *s, ByteIOContext *pb, AVStream *st, RMStream *rst, int len, - AVPacket *pkt, int *seq, int *flags, int64_t *ts); + AVPacket *pkt, int *seq, int flags, int64_t ts); /** * Retrieve one cached packet from the rm-context. The real container can |