On Fri, 4 May 2012, Alex Converse wrote:

On Fri, May 4, 2012 at 3:06 PM, Martin Storsjö <mar...@martin.st> wrote:
Convert C++ comments into C comments, clean up the comment
content (remove trailing periods).

Whats wrong with c99 comments?

Hmm, I thought some of our coding style guidelines preferred C style comments, but after looking at other common code, there's quite a bit of C99/C++ style comments around too, so I guess I can keep it in that style here, too.

---
 libavformat/rtpdec_h264.c |   87 ++++++++++++++++++++++++---------------------
 1 file changed, 47 insertions(+), 40 deletions(-)

diff --git a/libavformat/rtpdec_h264.c b/libavformat/rtpdec_h264.c
index 505bc81..a567d3d 100644
--- a/libavformat/rtpdec_h264.c
+++ b/libavformat/rtpdec_h264.c
@@ -20,7 +20,7 @@
 */

 /**
-* @file
+ * @file
 * @brief H.264 / RTP Code (RFC3984)
 * @author Ryan Martell <r...@martellventures.com>
 *
@@ -29,7 +29,8 @@
 * This currently supports packetization mode:
 * Single Nal Unit Mode (0), or
 * Non-Interleaved Mode (1).  It currently does not support
- * Interleaved Mode (2). (This requires implementing STAP-B, MTAP16, MTAP24, 
FU-B packet types)
+ * Interleaved Mode (2). (This requires implementing STAP-B, MTAP16, MTAP24,
+ *                        FU-B packet types)
 */

 #include "libavutil/base64.h"
@@ -46,7 +47,7 @@
 #include "rtpdec_formats.h"

 struct PayloadContext {
-    //sdp setup parameters
+    /* sdp setup parameters */
    uint8_t profile_idc;
    uint8_t profile_iop;
    uint8_t level_idc;
@@ -68,10 +69,11 @@ static int sdp_parse_fmtp_config_h264(AVStream * stream,
        av_log(codec, AV_LOG_DEBUG, "RTP Packetization Mode: %d\n", 
atoi(value));
        h264_data->packetization_mode = atoi(value);
        /*
-           Packetization Mode:
-           0 or not present: Single NAL mode (Only nals from 1-23 are allowed)
-           1: Non-interleaved Mode: 1-23, 24 (STAP-A), 28 (FU-A) are allowed.
-           2: Interleaved Mode: 25 (STAP-B), 26 (MTAP16), 27 (MTAP24), 28 
(FU-A), and 29 (FU-B) are allowed.
+         * Packetization Mode:
+         * 0 or not present: Single NAL mode (Only nals from 1-23 are allowed)
+         * 1: Non-interleaved Mode: 1-23, 24 (STAP-A), 28 (FU-A) are allowed.
+         * 2: Interleaved Mode: 25 (STAP-B), 26 (MTAP16), 27 (MTAP24), 28 
(FU-A),
+         *                      and 29 (FU-B) are allowed.
         */

This isn't doxy, why the extra *s?

I prefer it this way, and I think this is the common style.

// Martin
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to