[FFmpeg-devel,1/2] ffmpeg: Always run av_packet_split_side_data() before writing a packet

Submitted by Michael Niedermayer on Nov. 4, 2016, 12:43 p.m.

Details

Message ID 20161104124345.5031-2-michael@niedermayer.cc
State New
Headers show

Commit Message

Michael Niedermayer Nov. 4, 2016, 12:43 p.m.
The new automatically inserted bitstream filters are not compatible with merged side data.
This works around this by spliting the side data out.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 ffmpeg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/ffmpeg.c b/ffmpeg.c
index 28daf5f..6c02091 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -787,11 +787,11 @@  static void output_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost)
 {
     int ret = 0;
 
+    av_packet_split_side_data(pkt);
     /* apply the output bitstream filters, if any */
     if (ost->nb_bitstream_filters) {
         int idx;
 
-        av_packet_split_side_data(pkt);
         ret = av_bsf_send_packet(ost->bsf_ctx[0], pkt);
         if (ret < 0)
             goto finish;