1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

Merge commit '01947f07b81a57fb1e15114b710f6d5ae4f70a11'

* commit '01947f07b81a57fb1e15114b710f6d5ae4f70a11':
  avconv: remove a useless line

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-05-05 15:09:46 +02:00
commit 22ffa5390f

View File

@ -1672,7 +1672,6 @@ static void do_streamcopy(InputStream *ist, OutputStream *ost, const AVPacket *p
}
write_frame(of->ctx, &opkt, ost);
ost->st->codec->frame_number++;
}
int guess_input_channel_layout(InputStream *ist)