[FFmpeg-cvslog] Merge commit 'd59641abfd25a1007bdf4723d952887b1e3619c6'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sun Mar 12 13:20:57 2017 +0100| [8d2d81709882a72ba5fbeccd3ce3da48ff258e96] | committer: Clément Bœsch

Merge commit 'd59641abfd25a1007bdf4723d952887b1e3619c6'

* commit 'd59641abfd25a1007bdf4723d952887b1e3619c6':
  lavc: initialize AVCodecContext.sw_pix_fmt properly

Merged-by: Clément Bœsch <u at pkh.me>

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

 libavcodec/options.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libavcodec/options.c b/libavcodec/options.c
index d8e3dbf..7bdb0be 100644
--- a/libavcodec/options.c
+++ b/libavcodec/options.c
@@ -119,6 +119,7 @@ static int init_context_defaults(AVCodecContext *s, const AVCodec *codec)
     s->execute2            = avcodec_default_execute2;
     s->sample_aspect_ratio = (AVRational){0,1};
     s->pix_fmt             = AV_PIX_FMT_NONE;
+    s->sw_pix_fmt          = AV_PIX_FMT_NONE;
     s->sample_fmt          = AV_SAMPLE_FMT_NONE;
 
     s->reordered_opaque    = AV_NOPTS_VALUE;


======================================================================