[FFmpeg-cvslog] dashenc: Fix format string generation

Rodger Combs git at videolan.org
Thu Jan 22 12:06:28 CET 2015


ffmpeg | branch: master | Rodger Combs <rodger.combs at gmail.com> | Wed Jan 21 09:36:53 2015 -0600| [1d8aa23794cc63e9517d5055a2d48040b843b1cf] | committer: Martin Storsjö

dashenc: Fix format string generation

Previously this always used the "lld" format for all parameters,
not only time parameters.

Signed-off-by: Martin Storsjö <martin at martin.st>

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

 libavformat/dashenc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c
index 1432fc3..25fed12 100644
--- a/libavformat/dashenc.c
+++ b/libavformat/dashenc.c
@@ -282,7 +282,7 @@ static DASHTmplId dash_read_tmpl_id(const char *identifier, char *format_tag,
         // next parse the dash format-tag and generate a c-string format tag
         // (next_ptr now points at the first '%' at the beginning of the format-tag)
         if (id_type != DASH_TMPL_ID_UNDEFINED) {
-            const char *number_format = DASH_TMPL_ID_TIME ? "lld" : "d";
+            const char *number_format = (id_type == DASH_TMPL_ID_TIME) ? "lld" : "d";
             if (next_ptr[0] == '$') { // no dash format-tag
                 snprintf(format_tag, format_tag_size, "%%%s", number_format);
                 *ptr = &next_ptr[1];



More information about the ffmpeg-cvslog mailing list