Commit 55cbcd0d authored by GitLab CI's avatar GitLab CI

Merge remote-tracking branch 'upstream/master' into master-build

* upstream/master:
  Fix -Wduplicate-decl-specifier warnings
parents 3c422c66 78399ddc
......@@ -475,7 +475,7 @@ typedef enum
*****************************************************************************/
struct hb_job_s
{
PRIVATE const char * json; // JSON encoded job string
const char * json; // JSON encoded job string
/* ID assigned by UI so it can groups job passes together */
int sequence_id;
......@@ -858,7 +858,7 @@ struct hb_audio_config_s
* These samples should be dropped
* when decoding */
PRIVATE hb_rational_t timebase;
PRIVATE const char * name;
const char * name;
} in;
struct
......
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