mirror of https://git.ffmpeg.org/ffmpeg.git
avformat/utils: Remove redundant save+restore
If the size of the input packet is zero, av_grow_packet() used to call
av_new_packet() which would initialize the packet and (in particular)
reset the pos field. This behaviour (which was never documented and
arguably always contradicted the documented behaviour) was changed in
2fe04630
. This means that it is unnecessary to save and restore the
packet's position in append_packet_chunked().
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
parent
198081efb7
commit
94cdf82d53
|
@ -268,7 +268,6 @@ int ffio_limit(AVIOContext *s, int size)
|
|||
* Return the number of bytes read or an error. */
|
||||
static int append_packet_chunked(AVIOContext *s, AVPacket *pkt, int size)
|
||||
{
|
||||
int64_t orig_pos = pkt->pos; // av_grow_packet might reset pos
|
||||
int orig_size = pkt->size;
|
||||
int ret;
|
||||
|
||||
|
@ -301,7 +300,6 @@ static int append_packet_chunked(AVIOContext *s, AVPacket *pkt, int size)
|
|||
if (size > 0)
|
||||
pkt->flags |= AV_PKT_FLAG_CORRUPT;
|
||||
|
||||
pkt->pos = orig_pos;
|
||||
if (!pkt->size)
|
||||
av_packet_unref(pkt);
|
||||
return pkt->size > orig_size ? pkt->size - orig_size : ret;
|
||||
|
|
Loading…
Reference in New Issue