Merge commit '01947f07b81a57fb1e15114b710f6d5ae4f70a11'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 5 May 2014 13:09:46 +0000 (15:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 5 May 2014 13:09:55 +0000 (15:09 +0200)
* commit '01947f07b81a57fb1e15114b710f6d5ae4f70a11':
  avconv: remove a useless line

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
ffmpeg.c

diff --cc ffmpeg.c
+++ b/ffmpeg.c
@@@ -1661,18 -1133,8 +1661,17 @@@ static void do_streamcopy(InputStream *
          opkt.data = pkt->data;
          opkt.size = pkt->size;
      }
 +    av_copy_packet_side_data(&opkt, pkt);
 +
 +    if (ost->st->codec->codec_type == AVMEDIA_TYPE_VIDEO && (of->ctx->oformat->flags & AVFMT_RAWPICTURE)) {
 +        /* store AVPicture in AVPacket, as expected by the output format */
 +        avpicture_fill(&pict, opkt.data, ost->st->codec->pix_fmt, ost->st->codec->width, ost->st->codec->height);
 +        opkt.data = (uint8_t *)&pict;
 +        opkt.size = sizeof(AVPicture);
 +        opkt.flags |= AV_PKT_FLAG_KEY;
 +    }
  
      write_frame(of->ctx, &opkt, ost);
-     ost->st->codec->frame_number++;
  }
  
  int guess_input_channel_layout(InputStream *ist)