Commit 22ffa539 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '01947f07'

* commit '01947f07':
  avconv: remove a useless line
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 1efc0892 01947f07
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment