diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-11-01 22:58:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-11-01 23:03:24 +0100 |
| commit | 2b09a3ad19520bc3ae9adcff5506ac1f628406b4 (patch) | |
| tree | e281db1847c3a63fa08c1a14ec949e6215102385 /libavformat/img2enc.c | |
| parent | 6f2ad32a167ce4e0fd9ac8b38054a297c6463067 (diff) | |
| download | ffmpeg-2b09a3ad19520bc3ae9adcff5506ac1f628406b4.tar.gz | |
Revert "img2 encoder: allow %t in filename, based on patch from Yuval Adam"
breaks API
Found-by: jamrial
This reverts commit 1a956c64c8eff5edecb004fc7aafd21207e6485c.
Diffstat (limited to 'libavformat/img2enc.c')
| -rw-r--r-- | libavformat/img2enc.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libavformat/img2enc.c b/libavformat/img2enc.c index 69dbebe861..1297b1aaba 100644 --- a/libavformat/img2enc.c +++ b/libavformat/img2enc.c @@ -80,12 +80,10 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt) VideoMuxData *img = s->priv_data; AVIOContext *pb[4]; char filename[1024]; - AVStream *stream = s->streams[ pkt->stream_index ]; - AVCodecParameters *par = stream->codecpar; + AVCodecParameters *par = s->streams[pkt->stream_index]->codecpar; const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(par->format); int i; int nb_renames = 0; - int64_t ts = av_rescale_q(pkt->pts, stream->time_base, AV_TIME_BASE_Q); if (!img->is_pipe) { if (img->update) { @@ -101,7 +99,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt) } } else if (av_get_frame_filename2(filename, sizeof(filename), img->path, img->img_number, - AV_FRAME_FILENAME_FLAGS_MULTIPLE, ts) < 0 && + AV_FRAME_FILENAME_FLAGS_MULTIPLE) < 0 && img->img_number > 1) { av_log(s, AV_LOG_ERROR, "Could not get frame filename number %d from pattern '%s' (either set updatefirst or use a pattern like %%03d within the filename pattern)\n", |