diff mbox

[FFmpeg-devel] avformat/utils: don't overwrite the return value of read_packet()

Message ID 20180226031919.9156-1-jamrial@gmail.com
State Accepted
Commit f235359b2b1175585df757e6b60fabac29b8aa22
Headers show

Commit Message

James Almer Feb. 26, 2018, 3:19 a.m. UTC 
This only affected demuxers that didn't return reference counted packets.

Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavformat/utils.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Michael Niedermayer Feb. 27, 2018, 1:14 a.m. UTC | #1 
On Mon, Feb 26, 2018 at 12:19:19AM -0300, James Almer wrote:
> This only affected demuxers that didn't return reference counted packets.
> 
> Signed-off-by: James Almer <jamrial@gmail.com>
> ---
>  libavformat/utils.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)

probably ok

thx

[...]
James Almer Feb. 27, 2018, 1:18 a.m. UTC | #2 
On 2/26/2018 10:14 PM, Michael Niedermayer wrote:
> On Mon, Feb 26, 2018 at 12:19:19AM -0300, James Almer wrote:
>> This only affected demuxers that didn't return reference counted packets.
>>
>> Signed-off-by: James Almer <jamrial@gmail.com>
>> ---
>>  libavformat/utils.c | 6 +++---
>>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> probably ok
> 
> thx

Pushed.
diff mbox

Patch

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 2c2ea876b6..72531d4185 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -869,9 +869,9 @@  int ff_read_packet(AVFormatContext *s, AVPacket *pkt)
 
         if (!pkt->buf) {
             AVPacket tmp = { 0 };
-            ret = av_packet_ref(&tmp, pkt);
-            if (ret < 0)
-                return ret;
+            err = av_packet_ref(&tmp, pkt);
+            if (err < 0)
+                return err;
             *pkt = tmp;
         }