[FFmpeg-cvslog] ffmpeg.c: transcode_video(): do not go through filter network if encoding is not required

[Nicolas Noirbent]

ffmpeg | branch: master | Nicolas Noirbent <nicolas.noirbent at smartjog.com> | Fri Jan 13 09:58:16 2012 +0100| [c949d5b15d2af23dcbbe2cb35b819d4930625d15] | committer: Michael Niedermayer

ffmpeg.c: transcode_video(): do not go through filter network if encoding is not required

This fixes a segmentation fault when doing a transcoding and a stream
copy of the same input stream at the same time, e.g.:

ffmpeg -i in.mkv -c:v mpeg2video transcode.m2v -c copy copy.ts

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c949d5b15d2af23dcbbe2cb35b819d4930625d15
---

 ffmpeg.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index 085bb00..2ee4032 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2078,7 +2078,7 @@ static int transcode_video(InputStream *ist, AVPacket *pkt, int *got_output, int
     frame_sample_aspect= av_opt_ptr(avcodec_get_frame_class(), decoded_frame, "sample_aspect_ratio");
     for(i=0;i<nb_output_streams;i++) {
         OutputStream *ost = ost = &output_streams[i];
-        if(check_output_constraints(ist, ost)){
+        if(check_output_constraints(ist, ost) && ost->encoding_needed){
             if (!frame_sample_aspect->num)
                 *frame_sample_aspect = ist->st->sample_aspect_ratio;
             decoded_frame->pts = ist->pts;