[FFmpeg-cvslog] img2: Allow writing multiple files onto the same output file.

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Nov 27 15:07:49 2011 +0100| [102a2463d3a3f2c46f6ef9b30803491b91ffb653] | committer: Michael Niedermayer

img2: Allow writing multiple files onto the same output file.
Fixes Ticket687

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavformat/img2.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/libavformat/img2.c b/libavformat/img2.c
index ff159eb..b5f88e0 100644
--- a/libavformat/img2.c
+++ b/libavformat/img2.c
@@ -391,11 +391,10 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
 
     if (!img->is_pipe) {
         if (av_get_frame_filename(filename, sizeof(filename),
-                                  img->path, img->img_number) < 0 && img->img_number>1) {
-            av_log(s, AV_LOG_ERROR,
-                   "Could not get frame filename number %d from pattern '%s'\n",
-                   img->img_number, img->path);
-            return AVERROR(EINVAL);
+                                  img->path, img->img_number) < 0 && img->img_number==2) {
+            av_log(s, AV_LOG_WARNING,
+                   "Writing multiple frames to the same file, check the pattern '%s' if this is not what you want\n",
+                   img->path);
         }
         for(i=0; i<3; i++){
             if (avio_open2(&pb[i], filename, AVIO_FLAG_WRITE,