Mercurial > mplayer.hg

changeset 31938:93c67b51b171

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Print a warning, but allow to encode to a non-supported frame rate with libxvid. Patch by Carl Eric Codere, cecodere yahoo ca
author cehoyos
date Thu, 26 Aug 2010 18:44:14 +0000
parents 0b29d0c8c62d
children 6ccc2a358030
files libmpcodecs/ve_xvid4.c
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libmpcodecs/ve_xvid4.c	Thu Aug 26 18:42:47 2010 +0000
+++ b/libmpcodecs/ve_xvid4.c	Thu Aug 26 18:44:14 2010 +0000
@@ -1004,10 +1004,9 @@
 	if( ((float)mod->mux->h.dwRate/(float)mod->mux->h.dwScale > (float)selected_profile->fps) &&
 		(selected_profile->fps != 0))
 	{
-		mp_msg(MSGT_MENCODER,MSGL_ERR,
-			"xvid:[ERROR] frame rate must be <= %d for the chosen profile\n",
+		mp_msg(MSGT_MENCODER,MSGL_WARN,
+			"xvid:[WARNING] frame rate should be <= %d for the chosen profile\n",
 			selected_profile->fps);
-		return BAD;
 	}
 
 	/* Encodings zones */