[xiph-commits] r15381 - in trunk/ffmpeg2theora: . src
j at svn.xiph.org
j at svn.xiph.org
Fri Oct 10 06:47:11 PDT 2008
Author: j
Date: 2008-10-10 06:47:10 -0700 (Fri, 10 Oct 2008)
New Revision: 15381
Modified:
trunk/ffmpeg2theora/
trunk/ffmpeg2theora/ffmpeg2theora.1
trunk/ffmpeg2theora/src/ffmpeg2theora.c
trunk/ffmpeg2theora/src/ffmpeg2theora.h
Log:
new option --novideo, only encode audio from input file
Property changes on: trunk/ffmpeg2theora
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2008-10-06 14:09:28.766000032 +0200
committer: j
properties:
branch-nick: ffmpeg2theora
+ timestamp: 2008-10-10 15:16:34.171999931 +0200
committer: j
properties:
branch-nick: ffmpeg2theora
Name: bzr:file-ids
- SConstruct sconstruct-20080523165848-8nlost8hilp0zdcm-1
+ ffmpeg2theora.1 9490 at 0101bb08-14d6-0310-b084-bc0e0c8e3800:trunk%2Fffmpeg2theora:ffmpeg2theora.1
src/ffmpeg2theora.c 6863 at 0101bb08-14d6-0310-b084-bc0e0c8e3800:trunk%2Fffmpeg2theora:ffmpeg2theora.c
src/ffmpeg2theora.h ffmpeg2theora.h-20080523174200-q6z54q34pgkgpz50-1
Name: bzr:revision-id:v3-single1-dHJ1bmsvZmZtcGVnMnRoZW9yYQ..
- 191 j-20080517230830-he5x8v2m8yrfiw35
192 j-20080518224037-pkmoctzf4qce7tog
193 j-20080518224409-6hbfp3k2ssn6egqa
194 j-20080520111939-dhi52qwbqe7a47cu
195 j-20080523092252-gj9k9db0s67vl7dw
196 j-20080523092420-l0850yrq1qkgz9t0
197 j-20080523093057-l5g0ezzy5geu0pey
198 j-20080523094343-kcno1dm2e1lr38q4
199 j-20080523163006-kjl6ewea5sxawmq2
200 j-20080523165904-l2vm52qae0hlqkhp
201 j-20080523175432-2ed953iktnl8c7cr
202 j-20080525100939-7oja8pk08v9fquiw
203 j-20080526111321-nhzaqh6ivzn0vs7b
204 j-20080527100851-2v5eyxxrq1riqi50
205 j-20080527101341-9ynbgth2b15jw792
206 j-20080527205556-19tffvfrxgt3khld
207 j-20080527205840-zeestdde3v1zks9k
208 j-20080527210129-e73y56uwmzbcid00
209 j-20080527211813-5ll680ed1q4byp16
210 j-20080528102006-aeippim0tn70mz3f
211 j-20080528104907-40kiidjojvta8j61
212 j-20080528111329-vkqbt7xkat2o9h4z
213 j-20080529102940-q9xdwm5v9espzomv
214 j-20080529111405-nmh99aon1kmh22qm
215 j-20080530094948-ncq064s4uggd9z95
216 j-20080530095056-hko2vjfwipikwjyu
217 j-20080530171822-bab8sy8lpotf8081
218 j-20080603170442-v0pxspvfcucvsaex
219 j-20080617110355-xwbeg1xidmv8fubp
220 j-20080617110518-khqlhaan52kz3lii
221 j-20080723194934-63m20dc3zmkhwj4o
222 j-20080724140108-ntgbrk6913nvtk4b
223 j-20080802221321-3fcp0s6rehryx0n5
224 j-20080802221340-0s6mh8llk6nyon5d
225 j-20080901112127-tyeax385hwukjt13
226 j-20080915075112-fg3yc8radbplosnc
227 j-20080921103515-w89p8jqwt3oq5u20
228 j-20080921103703-prnl3ls2f6u4g177
229 j-20080921104137-otk3xx827h5cofwl
230 j-20080921104242-dswny7jm93stokej
231 j-20081001102101-rl2rf1x9u8e5zrqk
232 j-20081001103246-0uwni13nt5b2mqyw
233 j-20081001104039-68e6rbv58e743plv
234 j-20081001111423-31lxb69fs7023eqi
235 j-20081001112345-eo9e3eheszd68pkb
236 j-20081002180939-vwdafec5iu2ihyq6
237 j-20081003143408-49wdpdkvhnf719rq
238 j-20081003153911-nh2fzqikxgbm7tuk
239 j-20081006092929-7kh3399r2tkat0x8
240 j-20081006120928-dqhlormykse02wss
+ 191 j-20080517230830-he5x8v2m8yrfiw35
192 j-20080518224037-pkmoctzf4qce7tog
193 j-20080518224409-6hbfp3k2ssn6egqa
194 j-20080520111939-dhi52qwbqe7a47cu
195 j-20080523092252-gj9k9db0s67vl7dw
196 j-20080523092420-l0850yrq1qkgz9t0
197 j-20080523093057-l5g0ezzy5geu0pey
198 j-20080523094343-kcno1dm2e1lr38q4
199 j-20080523163006-kjl6ewea5sxawmq2
200 j-20080523165904-l2vm52qae0hlqkhp
201 j-20080523175432-2ed953iktnl8c7cr
202 j-20080525100939-7oja8pk08v9fquiw
203 j-20080526111321-nhzaqh6ivzn0vs7b
204 j-20080527100851-2v5eyxxrq1riqi50
205 j-20080527101341-9ynbgth2b15jw792
206 j-20080527205556-19tffvfrxgt3khld
207 j-20080527205840-zeestdde3v1zks9k
208 j-20080527210129-e73y56uwmzbcid00
209 j-20080527211813-5ll680ed1q4byp16
210 j-20080528102006-aeippim0tn70mz3f
211 j-20080528104907-40kiidjojvta8j61
212 j-20080528111329-vkqbt7xkat2o9h4z
213 j-20080529102940-q9xdwm5v9espzomv
214 j-20080529111405-nmh99aon1kmh22qm
215 j-20080530094948-ncq064s4uggd9z95
216 j-20080530095056-hko2vjfwipikwjyu
217 j-20080530171822-bab8sy8lpotf8081
218 j-20080603170442-v0pxspvfcucvsaex
219 j-20080617110355-xwbeg1xidmv8fubp
220 j-20080617110518-khqlhaan52kz3lii
221 j-20080723194934-63m20dc3zmkhwj4o
222 j-20080724140108-ntgbrk6913nvtk4b
223 j-20080802221321-3fcp0s6rehryx0n5
224 j-20080802221340-0s6mh8llk6nyon5d
225 j-20080901112127-tyeax385hwukjt13
226 j-20080915075112-fg3yc8radbplosnc
227 j-20080921103515-w89p8jqwt3oq5u20
228 j-20080921103703-prnl3ls2f6u4g177
229 j-20080921104137-otk3xx827h5cofwl
230 j-20080921104242-dswny7jm93stokej
231 j-20081001102101-rl2rf1x9u8e5zrqk
232 j-20081001103246-0uwni13nt5b2mqyw
233 j-20081001104039-68e6rbv58e743plv
234 j-20081001111423-31lxb69fs7023eqi
235 j-20081001112345-eo9e3eheszd68pkb
236 j-20081002180939-vwdafec5iu2ihyq6
237 j-20081003143408-49wdpdkvhnf719rq
238 j-20081003153911-nh2fzqikxgbm7tuk
239 j-20081006092929-7kh3399r2tkat0x8
240 j-20081006120928-dqhlormykse02wss
241 j-20081010131634-o5sswtynyozb0dmb
Modified: trunk/ffmpeg2theora/ffmpeg2theora.1
===================================================================
--- trunk/ffmpeg2theora/ffmpeg2theora.1 2008-10-10 13:46:58 UTC (rev 15380)
+++ trunk/ffmpeg2theora/ffmpeg2theora.1 2008-10-10 13:47:10 UTC (rev 15381)
@@ -117,11 +117,14 @@
.TP
.B \-H, \-\-samplerate
Set output samplerate (in Hz).
-.TP
-.B \-\-nosound
-Disable the sound from input.
.SS Input options:
.TP
+.B \-\-noaudio
+Disable audio from input.
+.TP
+.B \-\-novideo
+Disable video from input.
+.TP
.B \-\-deinterlace
Force deinterlace. Otherwise only material marked as interlaced will be
deinterlaced.
Modified: trunk/ffmpeg2theora/src/ffmpeg2theora.c
===================================================================
--- trunk/ffmpeg2theora/src/ffmpeg2theora.c 2008-10-10 13:46:58 UTC (rev 15380)
+++ trunk/ffmpeg2theora/src/ffmpeg2theora.c 2008-10-10 13:47:10 UTC (rev 15381)
@@ -52,7 +52,8 @@
DEINTERLACE_FLAG,
OPTIMIZE_FLAG,
SYNC_FLAG,
- NOSOUND_FLAG,
+ NOAUDIO_FLAG,
+ NOVIDEO_FLAG,
CROPTOP_FLAG,
CROPBOTTOM_FLAG,
CROPRIGHT_FLAG,
@@ -140,6 +141,7 @@
ff2theora this = calloc (1, sizeof (*this));
if (this != NULL){
this->disable_audio=0;
+ this->disable_video=0;
this->video_index = -1;
this->audio_index = -1;
this->start_time=0;
@@ -318,7 +320,7 @@
AVCodecContext *enc = this->context->streams[i]->codec;
switch (enc->codec_type){
case CODEC_TYPE_VIDEO:
- if (this->video_index < 0)
+ if (this->video_index < 0 && !this->disable_video)
this->video_index = i;
break;
case CODEC_TYPE_AUDIO:
@@ -1177,7 +1179,8 @@
" -A, --audiobitrate [32 to 500] encoding bitrate for audio (kb/s)\n"
" -c, --channels set number of output channels\n"
" -H, --samplerate set output samplerate (in Hz)\n"
- " --nosound disable the sound from input\n"
+ " --noaudio disable audio from input\n"
+ " --novideo disable video from input\n"
"\n"
"Input options:\n"
" --deinterlace force deinterlace, otherwise only material\n"
@@ -1284,7 +1287,9 @@
{"brightness",required_argument,NULL,'B'},
{"contrast",required_argument,NULL,'C'},
{"saturation",required_argument,NULL,'Z'},
- {"nosound",0,&flag,NOSOUND_FLAG},
+ {"nosound",0,&flag,NOAUDIO_FLAG},
+ {"noaudio",0,&flag,NOAUDIO_FLAG},
+ {"novideo",0,&flag,NOVIDEO_FLAG},
#ifdef HAVE_FRAMEHOOK
{"vhook",required_argument,&flag,VHOOK_FLAG},
#endif
@@ -1368,10 +1373,14 @@
convert->sync = 1;
flag = -1;
break;
- case NOSOUND_FLAG:
+ case NOAUDIO_FLAG:
convert->disable_audio = 1;
flag = -1;
break;
+ case NOVIDEO_FLAG:
+ convert->disable_video = 1;
+ flag = -1;
+ break;
case OPTIMIZE_FLAG:
info.speed_level = 0;
flag = -1;
@@ -1777,6 +1786,9 @@
if(convert->disable_audio){
fprintf(stderr," [audio disabled].\n");
}
+ if(convert->disable_video){
+ fprintf(stderr," [video disabled].\n");
+ }
if(convert->sync){
fprintf(stderr," Use A/V Sync from input container.\n");
}
Modified: trunk/ffmpeg2theora/src/ffmpeg2theora.h
===================================================================
--- trunk/ffmpeg2theora/src/ffmpeg2theora.h 2008-10-10 13:46:58 UTC (rev 15380)
+++ trunk/ffmpeg2theora/src/ffmpeg2theora.h 2008-10-10 13:47:10 UTC (rev 15381)
@@ -34,6 +34,8 @@
int deinterlace;
int vhook;
+ int disable_video;
+
int audiostream;
int sample_rate;
int channels;
More information about the commits
mailing list