Originally committed as revision 21255 to svn://svn.ffmpeg.org/ffmpeg/trunk
| ... | ... |
@@ -299,12 +299,12 @@ do_audio_encoding flac.flac "-ar 44100" "-acodec flac -compression_level 2" |
| 299 | 299 |
do_audio_decoding |
| 300 | 300 |
fi |
| 301 | 301 |
|
| 302 |
-if [ -n "$do_wma" ] ; then |
|
| 303 |
-# wmav1 |
|
| 302 |
+if [ -n "$do_wmav1" ] ; then |
|
| 304 | 303 |
do_audio_encoding wmav1.asf "-ar 44100" "-acodec wmav1" |
| 305 | 304 |
do_ffmpeg_nomd5 $pcm_dst -i $target_path/$file -f wav |
| 306 | 305 |
$tiny_psnr $pcm_dst $pcm_ref 2 8192 >> $logfile |
| 307 |
-# wmav2 |
|
| 306 |
+fi |
|
| 307 |
+if [ -n "$do_wmav2" ] ; then |
|
| 308 | 308 |
do_audio_encoding wmav2.asf "-ar 44100" "-acodec wmav2" |
| 309 | 309 |
do_ffmpeg_nomd5 $pcm_dst -i $target_path/$file -f wav |
| 310 | 310 |
$tiny_psnr $pcm_dst $pcm_ref 2 8192 >> $logfile |
| 311 | 311 |
deleted file mode 100644 |
| ... | ... |
@@ -1,8 +0,0 @@ |
| 1 |
-26a7f6b0f0b7181df8df3fa589f6bf81 *./tests/data/a-wmav1.asf |
|
| 2 |
-106004 ./tests/data/a-wmav1.asf |
|
| 3 |
-stddev:12245.27 PSNR: 14.57 bytes: 1065004/ 1058444 |
|
| 4 |
-stddev: 2097.78 PSNR: 29.89 bytes: 1056812/ 1058444 |
|
| 5 |
-7c6c0cb692af01b312ae345723674b5f *./tests/data/a-wmav2.asf |
|
| 6 |
-106044 ./tests/data/a-wmav2.asf |
|
| 7 |
-stddev:12249.69 PSNR: 14.57 bytes: 1065004/ 1058444 |
|
| 8 |
-stddev: 2091.12 PSNR: 29.92 bytes: 1056812/ 1058444 |
| 0 | 4 |
deleted file mode 100644 |
| ... | ... |
@@ -1,8 +0,0 @@ |
| 1 |
-26a7f6b0f0b7181df8df3fa589f6bf81 *./tests/data/a-wmav1.asf |
|
| 2 |
-106004 ./tests/data/a-wmav1.asf |
|
| 3 |
-stddev:12245.27 PSNR: 14.57 bytes: 1065004/ 1058444 |
|
| 4 |
-stddev: 2097.78 PSNR: 29.89 bytes: 1056812/ 1058444 |
|
| 5 |
-7c6c0cb692af01b312ae345723674b5f *./tests/data/a-wmav2.asf |
|
| 6 |
-106044 ./tests/data/a-wmav2.asf |
|
| 7 |
-stddev:12249.69 PSNR: 14.57 bytes: 1065004/ 1058444 |
|
| 8 |
-stddev: 2091.12 PSNR: 29.92 bytes: 1056812/ 1058444 |