falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

Merge commit '01947f07b81a57fb1e15114b710f6d5ae4f70a11' 

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.3
Michael Niedermayer 11 years ago
parent
1efc089218 01947f07b8
commit
22ffa5390f
1 changed files with 0 additions and 1 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +0
    -1
      ffmpeg.c

+ 0
- 1
ffmpeg.c View File

@@ -1672,7 +1672,6 @@ static void do_streamcopy(InputStream *ist, OutputStream *ost, const AVPacket *p
} }


write_frame(of->ctx, &opkt, ost); write_frame(of->ctx, &opkt, ost);
ost->st->codec->frame_number++;
} }


int guess_input_channel_layout(InputStream *ist) int guess_input_channel_layout(InputStream *ist)


Write Preview
Loading…
Cancel
Save