avformat/internal: Add ff_get_frame_filename

It's similar to av_get_frame_filename2 but with int64_t number support. Make av_get_frame_filename* a wrapper over ff_get_frame_filename.

Zhao Zhili committed 2 years ago

Commit a2d96631 parent 8e76c992 files · +24 −3Browse files

Unified · Split

2 files

@@ -745,6 +745,22 @@ void ff_format_set_url(AVFormatContext s, char url); · 744 unmodified lines
745	*/	745	*/
746	int ff_match_url_ext(const char url, const char extensions);	746	int ff_match_url_ext(const char url, const char extensions);
747		747
		748	/**
		749	* Return in 'buf' the path with '%d' replaced by a number.
		750	*
		751	* Also handles the '%0nd' format where 'n' is the total number
		752	* of digits and '%%'.
		753	*
		754	* @param buf destination buffer
		755	* @param buf_size destination buffer size
		756	* @param path path with substitution template
		757	* @param number the number to substitute
		758	* @param flags AV_FRAME_FILENAME_FLAGS_*
		759	* @return 0 if OK, -1 on format error
		760	*/
		761	int ff_get_frame_filename(char buf, int buf_size, const char path,
		762	int64_t number, int flags);
		763
748	struct FFOutputFormat;	764	struct FFOutputFormat;
749	struct FFInputFormat;	765	struct FFInputFormat;
750	void avpriv_register_devices(const struct FFOutputFormat * const o[],	766	void avpriv_register_devices(const struct FFOutputFormat * const o[],

     return (sec * 1000000) + usec;
 }
-int av_get_frame_filename2(char *buf, int buf_size, const char *path, int number, int flags)
+int ff_get_frame_filename(char *buf, int buf_size, const char *path, int64_t number, int flags)
 {
     const char *p;
     char *q, buf1[20], c;
                 percentd_found = 1;
                 if (number < 0)
                     nd += 1;
-                snprintf(buf1, sizeof(buf1), "%0*d", nd, number);
+                snprintf(buf1, sizeof(buf1), "%0*" PRId64, nd, number);
                 len = strlen(buf1);
                 if ((q - buf + len) > buf_size - 1)
                     goto fail;
     return -1;
 }
+int av_get_frame_filename2(char *buf, int buf_size, const char *path, int number, int flags)
+{
+    return ff_get_frame_filename(buf, buf_size, path, number, flags);
+}
 int av_get_frame_filename(char *buf, int buf_size, const char *path, int number)
 {
-    return av_get_frame_filename2(buf, buf_size, path, number, 0);
+    return ff_get_frame_filename(buf, buf_size, path, number, 0);
 }
 void av_url_split(char *proto, int proto_size,

Keyboard shortcuts