[FFmpeg-cvslog] Merge commit 'f65285aba0df7d46298abe0c945dfee05cbc6028'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sun Mar 12 13:21:01 2017 +0100| [5e193daaa28d2fca34ad21d11d58f0b135388246] | committer: Clément Bœsch

Merge commit 'f65285aba0df7d46298abe0c945dfee05cbc6028'

* commit 'f65285aba0df7d46298abe0c945dfee05cbc6028':
  lavc: set sw_pix_fmt for hwaccel encoding

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

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

 libavcodec/utils.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 3c8a9cc..4d1b632 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1593,6 +1593,17 @@ FF_ENABLE_DEPRECATION_WARNINGS
                 ret = AVERROR(EINVAL);
                 goto free_and_end;
             }
+            if (avctx->sw_pix_fmt != AV_PIX_FMT_NONE &&
+                avctx->sw_pix_fmt != frames_ctx->sw_format) {
+                av_log(avctx, AV_LOG_ERROR,
+                       "Mismatching AVCodecContext.sw_pix_fmt (%s) "
+                       "and AVHWFramesContext.sw_format (%s)\n",
+                       av_get_pix_fmt_name(avctx->sw_pix_fmt),
+                       av_get_pix_fmt_name(frames_ctx->sw_format));
+                ret = AVERROR(EINVAL);
+                goto free_and_end;
+            }
+            avctx->sw_pix_fmt = frames_ctx->sw_format;
         }
     }
 


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