summaryrefslogtreecommitdiff
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-05-05 15:09:46 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-05-05 15:09:55 +0200
commit22ffa5390f6b4bb99fc6cd1fb0f629f6c3a9ba8d (patch)
treeac271edc3a53d815728c2ca5b287d508442ba6c3 /ffmpeg.c
parent1efc08921868c882427444e2beb9832e221b24cd (diff)
parent01947f07b81a57fb1e15114b710f6d5ae4f70a11 (diff)
Merge commit '01947f07b81a57fb1e15114b710f6d5ae4f70a11'
* commit '01947f07b81a57fb1e15114b710f6d5ae4f70a11': avconv: remove a useless line Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 948757ca40..3b5758d312 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -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)