[FFmpeg-cvslog] Merge commit '78fa0b9033c0834c049e2aedf71a8c613fed87ab'

[Mark Thompson]

ffmpeg | branch: master | Mark Thompson <sw at jkqxz.net> | Wed Feb 21 22:40:08 2018 +0000| [7386b4ff39506b7a34b3689cc4b05993ed9b4a4f] | committer: Mark Thompson

Merge commit '78fa0b9033c0834c049e2aedf71a8c613fed87ab'

* commit '78fa0b9033c0834c049e2aedf71a8c613fed87ab':
  h264_metadata: Always add the SEI user data to the first access unit

Mostly already present from a308872b049e33f69f4b629a06f47e3681906b93,
one cosmetic change applied.

Merged-by: Mark Thompson <sw at jkqxz.net>

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

 libavcodec/h264_metadata_bsf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/h264_metadata_bsf.c b/libavcodec/h264_metadata_bsf.c
index 20ac299bda..81cdcac5cf 100644
--- a/libavcodec/h264_metadata_bsf.c
+++ b/libavcodec/h264_metadata_bsf.c
@@ -288,7 +288,7 @@ static int h264_metadata_filter(AVBSFContext *bsf, AVPacket *out)
         }
     }
 
-    // Insert the SEI in access units containing SPSs, and also
+    // Only insert the SEI in access units containing SPSs, and also
     // unconditionally in the first access unit we ever see.
     if (ctx->sei_user_data && (has_sps || !ctx->sei_first_au)) {
         H264RawSEIPayload payload = {


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