diff options
Diffstat (limited to 'libhb')
| -rw-r--r-- | libhb/hb_json.c | 2 | ||||
| -rw-r--r-- | libhb/work.c | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/libhb/hb_json.c b/libhb/hb_json.c index 8020221d1..0ee09f77b 100644 --- a/libhb/hb_json.c +++ b/libhb/hb_json.c @@ -766,7 +766,7 @@ hb_job_t* hb_json_to_job( hb_handle_t * h, const char * json_job ) // Audio {CopyMask, FallbackEncoder} "s?{s?i, s?i}," // Subtitle {Search {Enable, Forced, Default, Burn}} - "s?{s?{s:b, s?b, s?b, s?b}}," + "s?{s?{s?b, s?b, s?b, s?b}}," // MetaData {Name, Artist, Composer, AlbumArtist, ReleaseDate, // Comment, Genre, Description, LongDescription} "s?{s?s, s?s, s?s, s?s, s?s, s?s, s?s, s?s, s?s}," diff --git a/libhb/work.c b/libhb/work.c index 01060c01f..b3d0744d7 100644 --- a/libhb/work.c +++ b/libhb/work.c @@ -106,6 +106,13 @@ static void work_func( void * _work ) // Expand json string to full job struct hb_job_t *new_job = hb_json_to_job(job->h, job->json); + if (new_job == NULL) + { + hb_job_close(&job); + hb_list_close(&passes); + *work->die = 1; + break; + } new_job->h = job->h; hb_job_close(&job); job = new_job; |