diff mbox

[FFmpeg-devel] avformat/concatdec: only set output stream index before returning packet

Message ID 20180325203154.13682-1-cus@passwd.hu
State Accepted
Commit 37d472a906bd9112225129fc35d9c94ae2ee9c3e
Headers show

Commit Message

Marton Balint March 25, 2018, 8:31 p.m. UTC 
Fixes ticket #6434.

Signed-off-by: Marton Balint <cus@passwd.hu>
---
 libavformat/concatdec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Nicolas George April 1, 2018, 10:45 a.m. UTC | #1 
Marton Balint (2018-03-25):
> Fixes ticket #6434.
> 
> Signed-off-by: Marton Balint <cus@passwd.hu>
> ---
>  libavformat/concatdec.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

LGTM, thanks.

Regards,
Marton Balint April 2, 2018, 6:58 p.m. UTC | #2 
On Sun, 1 Apr 2018, Nicolas George wrote:

> Marton Balint (2018-03-25):
>> Fixes ticket #6434.
>>
>> Signed-off-by: Marton Balint <cus@passwd.hu>
>> ---
>>  libavformat/concatdec.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> LGTM, thanks.

Applied, thanks.

Regards,
Marton
diff mbox

Patch

diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c
index 8fff9cc2cb..bbe13136fa 100644
--- a/libavformat/concatdec.c
+++ b/libavformat/concatdec.c
@@ -603,7 +603,6 @@  static int concat_read_packet(AVFormatContext *avf, AVPacket *pkt)
             av_packet_unref(pkt);
             continue;
         }
-        pkt->stream_index = cs->out_stream_index;
         break;
     }
     if ((ret = filter_packet(avf, cs, pkt)))
@@ -646,6 +645,7 @@  static int concat_read_packet(AVFormatContext *avf, AVPacket *pkt)
         }
     }
 
+    pkt->stream_index = cs->out_stream_index;
     return ret;
 }