Merge branch 'master' into progress_with_io

This commit is contained in:
Christian Schneider 2017-06-27 06:54:14 +02:00
commit 2b7fc2d2ed
47 changed files with 694 additions and 460 deletions

View file

@ -521,10 +521,10 @@ int init(int argc, char* argv[]) {
// init JPG suppression
suppress_jpg_parsing_until = -1;
// init MP3 suppression
for (i = 0; i < 16; i++) {
suppress_mp3_type_until[i] = -1;
suppress_mp3_type_until[i] = -1;
}
suppress_mp3_big_value_pairs_sum = -1;
mp3_parsing_cache_second_frame = -1;
@ -1171,6 +1171,16 @@ int init_comfort(int argc, char* argv[]) {
use_zlib_level[i] = true;
}
// init JPG suppression
suppress_jpg_parsing_until = -1;
// init MP3 suppression
for (i = 0; i < 16; i++) {
suppress_mp3_type_until[i] = -1;
}
suppress_mp3_big_value_pairs_sum = -1;
mp3_parsing_cache_second_frame = -1;
// parse parameters (should be input file only)
if (argc == 1) {
printf("Usage:\n");