Revert "img2 encoder: allow %t in filename, based on patch from Yuval Adam"

breaks API

Found-by: jamrial
This reverts commit 1a956c64c8eff5edecb004fc7aafd21207e6485c.

1 files changed, 4 insertions, 38 deletions

diff --git a/libavformat/utils.c b/libavformat/utils.c
index b6a7461d19..31572f3807 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -4379,18 +4379,15 @@ uint64_t ff_ntp_time(void)
     return (av_gettime() / 1000) * 1000 + NTP_OFFSET_US;
 }
 
-int av_get_frame_filename2(char *buf, int buf_size, const char *path, int number, int flags, int64_t ts)
+int av_get_frame_filename2(char *buf, int buf_size, const char *path, int number, int flags)
 {
     const char *p;
     char *q, buf1[20], c;
-    int nd, len, percentd_found, percentt_found;
-    int hours, mins, secs, ms;
-    int64_t abs_ts;
+    int nd, len, percentd_found;
 
     q = buf;
     p = path;
     percentd_found = 0;
-    percentt_found = 0;
     for (;;) {
         c = *p++;
         if (c == '\0')
@@ -4419,37 +4416,6 @@ int av_get_frame_filename2(char *buf, int buf_size, const char *path, int number
                 memcpy(q, buf1, len);
                 q += len;
                 break;
-            case 't':
-                if (!(flags & AV_FRAME_FILENAME_FLAGS_MULTIPLE) && percentt_found) {
-                    av_log(NULL, AV_LOG_ERROR, "double %%t not allowed");
-                    goto fail;
-                }
-                if (ts == 0) {
-                    av_log(NULL, AV_LOG_DEBUG, "%%t but no ts, using 0"); // necessary for first frame on some streams
-                }
-                percentt_found = 1;
-                abs_ts = llabs(ts);
-                ms = abs_ts % AV_TIME_BASE;
-                abs_ts /= AV_TIME_BASE;
-                secs = abs_ts % 60;
-                abs_ts /= 60;
-                mins = abs_ts % 60;
-                abs_ts /= 60;
-                hours = abs_ts;
-                if (ts < 0)
-                      snprintf(buf1, sizeof(buf1),
-                             "-%02d.%02d.%02d.%03d", hours, mins, secs, ms);
-                else
-                    snprintf(buf1, sizeof(buf1),
-                             "%02d.%02d.%02d.%03d", hours, mins, secs, ms);
-                len = strlen(buf1);
-                if ((q - buf + len) > buf_size - 1) {
-                   av_log(NULL, AV_LOG_ERROR, "%%t size overflow");
-                   goto fail;
-                }
-                memcpy(q, buf1, len);
-                q += len;
-                break;
             default:
                 goto fail;
             }
@@ -4459,7 +4425,7 @@ addchar:
                 *q++ = c;
         }
     }
-    if (!percentd_found && !percentt_found)
+    if (!percentd_found)
         goto fail;
     *q = '\0';
     return 0;
@@ -4470,7 +4436,7 @@ fail:
 
 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, 0);
+    return av_get_frame_filename2(buf, buf_size, path, number, 0);
 }
 
 void av_url_split(char *proto, int proto_size,