[FFmpeg-cvslog] Merge commit '254e728d207c173a3714e6a01c9d68fcb3af8b73'

Mark Thompson git at videolan.org
Wed Feb 21 23:36:46 EET 2018


ffmpeg | branch: master | Mark Thompson <sw at jkqxz.net> | Wed Feb 21 21:36:08 2018 +0000| [7dc8752e614a9aa5b3378be5185d97741ee7735f] | committer: Mark Thompson

Merge commit '254e728d207c173a3714e6a01c9d68fcb3af8b73'

* commit '254e728d207c173a3714e6a01c9d68fcb3af8b73':
  cbs: Minor comment fixes / cosmetics

Mostly already present, one small fix.

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

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

 libavcodec/cbs_internal.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/cbs_internal.h b/libavcodec/cbs_internal.h
index ae0b417b43..e4fe70a16a 100644
--- a/libavcodec/cbs_internal.h
+++ b/libavcodec/cbs_internal.h
@@ -32,9 +32,9 @@ typedef struct CodedBitstreamType {
 
     // Split frag->data into coded bitstream units, creating the
     // frag->units array.  Fill data but not content on each unit.
-    // header is set if the fragment came from a header block, which
-    // may require different parsing for some codecs (e.g. the AVCC
-    // header in H.264).
+    // The header argument should be set if the fragment came from
+    // a header block, which may require different parsing for some
+    // codecs (e.g. the AVCC header in H.264).
     int (*split_fragment)(CodedBitstreamContext *ctx,
                           CodedBitstreamFragment *frag,
                           int header);


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




More information about the ffmpeg-cvslog mailing list