[FFmpeg-cvslog] ffmpeg: prefer dec/enc over ost/ist->st->codec in do_video_out()

Stefano Sabatini git at videolan.org
Sat May 7 12:09:27 CEST 2011


ffmpeg | branch: master | Stefano Sabatini <stefano.sabatini-lala at poste.it> | Fri May  6 11:14:15 2011 +0200| [04c373c1e98c2f62632eb3cd12726945173225ea] | committer: Stefano Sabatini

ffmpeg: prefer dec/enc over ost/ist->st->codec in do_video_out()

Compact code, improve readability.

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

 ffmpeg.c |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index f9f08cd..ae2c329 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1228,14 +1228,9 @@ static void do_video_out(AVFormatContext *s,
             /* initialize a new scaler context */
             sws_freeContext(ost->img_resample_ctx);
             sws_flags = av_get_int(sws_opts, "sws_flags", NULL);
-            ost->img_resample_ctx = sws_getContext(
-                ist->st->codec->width,
-                ist->st->codec->height,
-                ist->st->codec->pix_fmt,
-                ost->st->codec->width,
-                ost->st->codec->height,
-                ost->st->codec->pix_fmt,
-                sws_flags, NULL, NULL, NULL);
+            ost->img_resample_ctx = sws_getContext(dec->width, dec->height, dec->pix_fmt,
+                                                   enc->width, enc->height, enc->pix_fmt,
+                                                   sws_flags, NULL, NULL, NULL);
             if (ost->img_resample_ctx == NULL) {
                 fprintf(stderr, "Cannot get resampling context\n");
                 ffmpeg_exit(1);



More information about the ffmpeg-cvslog mailing list