Commit fe83aa66 authored by Jan Gerber's avatar Jan Gerber

- change version to 0.13

 - make dts check optional, as intended
 - allow -2 as audio quality if compiled with libvorbis aoTuV 

parent 3f87ed27
svn 2005-??-??
0.13 2005-03-12
- add new command line options, starttime, endtime, sharpness, keyint
- fix compile issues with new version of faad
- better support for stdout on win32,
to allow ezstream streaming non-theora source types
- deinterlace only interlaced input by default
- deinterlace only input marked as interlaced by default
- handle input files with frame sizes that are not a multiple of 16
- document --channels to resample audio to i.e. 1 channel
0.12 2004-11-18
- add more command line options, for bitrate modes, metadata
......
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
AC_INIT(ffmpeg2theora,0.12)
AC_INIT(ffmpeg2theora,0.13)
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([dist-bzip2])
......@@ -81,8 +81,12 @@ fi
AC_SUBST(FFMPEG_CFLAGS)
AC_SUBST(FFMPEG_LIBS)
PKG_CHECK_MODULES(DTS,libdts )
FFMPEG_LIBS="$FFMPEG_LIBS $DTS_LIBS"
PKG_CHECK_MODULES(DTS, libdts, HAVE_DTS=yes, HAVE_DTS=no)
if test "x$HAVE_DTS" = "xyes"
then
FFMPEG_LIBS="$FFMPEG_LIBS $DTS_LIBS"
fi
PKG_CHECK_MODULES(XIPH,ogg >= 1.1 vorbis vorbisenc theora )
......
......@@ -183,8 +183,6 @@ void ff2theora_output(ff2theora this) {
}
if (this->deinterlace==1)
fprintf(stderr," Deinterlace: on\n");
else
fprintf(stderr," Deinterlace: off\n");
if(this->picture_height==0 &&
(this->frame_leftBand || this->frame_rightBand || this->frame_topBand || this->frame_bottomBand) ){
......@@ -631,7 +629,7 @@ void print_usage (){
"\t --audioquality,-a\t[-1 to 10] encoding quality for audio\n"
"\t --audiobitrate,-A\t[45 to 2000] encoding bitrate for audio\n"
"\t --samplerate,-H\tset output samplerate in Hz\n"
"\t --channels,-c\tset number of output sound channels\n"
"\t --channels,-c\t\tset number of output sound channels\n"
"\t --nosound\t\tdisable the sound from input\n"
"\t --endtime,-e\t\tend encoding at this time (in sec)\n"
"\t --starttime,-s\t\tstart encoding at this time (in sec)\n"
......@@ -640,8 +638,9 @@ void print_usage (){
"\t\t\t\t '"PACKAGE" -p info' for more informations\n"
"\nInput options:\n"
"\t --deinterlace,-d \tforce deinterlace,n"
"\t\t\t\t\t otherwise only interlaced material is deinterlaced\\n"
"\t --deinterlace,-d \tforce deinterlace\n"
"\t\t\t\t otherwise only material marked as interlaced \n"
"\t\t\t\t will be deinterlaced\n"
"\t --format,-f\t\tspecify input format\n"
"\t --inputfps [fps]\toverride input fps\n"
......@@ -844,7 +843,7 @@ int main (int argc, char **argv){
break;
case 'a':
convert->audio_quality=atof(optarg)*.099;
if(convert->audio_quality<-.1 || convert->audio_quality>1){
if(convert->audio_quality<-.2 || convert->audio_quality>1){
fprintf(stderr,"only values from -1 to 10 are valid for audio quality\n");
exit(1);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment