ffmpeg | branch: master | Stefano Sabatini <[email protected]> | Tue Apr 12 18:14:45 2016 +0200| [9ccdf04bd0aa9a2fb1005776ced65d082b6afc5a] | committer: Stefano Sabatini
lavf/mpegtsenc: move putstr8 definition up This allows to use the function in a future commit. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9ccdf04bd0aa9a2fb1005776ced65d082b6afc5a --- libavformat/mpegtsenc.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 71a6642..ca038a6 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -264,6 +264,23 @@ static void mpegts_write_pat(AVFormatContext *s) data, q - data); } +/* NOTE: !str is accepted for an empty string */ +static void putstr8(uint8_t **q_ptr, const char *str) +{ + uint8_t *q; + int len; + + q = *q_ptr; + if (!str) + len = 0; + else + len = strlen(str); + *q++ = len; + memcpy(q, str, len); + q += len; + *q_ptr = q; +} + static int mpegts_write_pmt(AVFormatContext *s, MpegTSService *service) { MpegTSWrite *ts = s->priv_data; @@ -646,23 +663,6 @@ static int mpegts_write_pmt(AVFormatContext *s, MpegTSService *service) return 0; } -/* NOTE: !str is accepted for an empty string */ -static void putstr8(uint8_t **q_ptr, const char *str) -{ - uint8_t *q; - int len; - - q = *q_ptr; - if (!str) - len = 0; - else - len = strlen(str); - *q++ = len; - memcpy(q, str, len); - q += len; - *q_ptr = q; -} - static void mpegts_write_sdt(AVFormatContext *s) { MpegTSWrite *ts = s->priv_data; _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
