summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-12-12 15:17:53 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-12-12 15:17:53 +0000
commit72396a05a9728c24d20a0c1280a675a6e482096f (patch)
treef3d01035bd6aac82c9be7c9cd08ac0fc5c73f891
parenta328d9ff57e273b73458e6fdd4d9b23c4b4de3bc (diff)
downloadmpv-72396a05a9728c24d20a0c1280a675a6e482096f.tar.bz2
mpv-72396a05a9728c24d20a0c1280a675a6e482096f.tar.xz
fix leak with -fixed-vo, allow concatenating
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14146 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--ChangeLog3
-rw-r--r--libvo/vo_yuv4mpeg.c22
2 files changed, 21 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 5b8dfcb528..fdeaf727ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -45,7 +45,8 @@ MPlayer (1.0)
* support for mixer channel selection in the ALSA audio output driver
* jpeg video output driver now supports output to multiple directories
* audio output driver for the polypaudio sound server
- * yuv4mpeg video output now has a file= suboption.
+ * yuv4mpeg video output now has a file= suboption, can now be used with
+ -fixed-vo to concatenate files having same width, height and fps
Decoders:
* "experimental" support for 20 and 24 bit LPCM (DVD-Audio)
diff --git a/libvo/vo_yuv4mpeg.c b/libvo/vo_yuv4mpeg.c
index 991d13773d..209f54dab6 100644
--- a/libvo/vo_yuv4mpeg.c
+++ b/libvo/vo_yuv4mpeg.c
@@ -51,8 +51,9 @@ static vo_info_t info =
LIBVO_EXTERN (yuv4mpeg)
-static int image_width;
-static int image_height;
+static int image_width = 0;
+static int image_height = 0;
+static float image_fps = 0;
static uint8_t *image = NULL;
static uint8_t *image_y = NULL;
@@ -80,8 +81,19 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
uint32_t d_height, uint32_t fullscreen, char *title,
uint32_t format)
{
+ if (image_width == width && image_height == height &&
+ image_fps == vo_fps && vo_config_count)
+ return 0;
+ if (vo_config_count) {
+ mp_msg(MSGT_VO, MSGL_WARN,
+ "Video formats differ (w:%i=>%i, h:%i=>%i, fps:%f=>%f), "
+ "restarting output.\n",
+ image_width, width, image_height, height, image_fps, vo_fps);
+ uninit();
+ }
image_height = height;
image_width = width;
+ image_fps = vo_fps;
using_format = format;
if (Y4M_IS_INTERLACED)
@@ -146,7 +158,7 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width,
/* At least the interlacing is ok now */
fprintf(yuv_out, "YUV4MPEG2 W%d H%d F%ld:%ld I%c A0:0\n",
- image_width, image_height, (long)(vo_fps * 1000000.0),
+ image_width, image_height, (long)(image_fps * 1000000.0),
(long)1000000, config_interlace);
fflush(yuv_out);
@@ -448,6 +460,7 @@ static uint32_t query_format(uint32_t format)
return 0;
}
+// WARNING: config(...) also uses this
static void uninit(void)
{
if(image)
@@ -469,6 +482,9 @@ static void uninit(void)
if (yuv_filename)
free(yuv_filename);
yuv_filename = NULL;
+ image_width = 0;
+ image_height = 0;
+ image_fps = 0;
}