#include <stdint.h>
-#include "libavutil/audioconvert.h"
+#include "libavutil/channel_layout.h"
#include "libavcodec/avcodec.h"
#include "mov_chan.h"
label_mask |= mask_incr;
}
}
- if (layout_tag == 0)
+ if (layout_tag == 0) {
+ if (label_mask)
st->codec->channel_layout = label_mask;
- else
+ } else
st->codec->channel_layout = ff_mov_get_channel_layout(layout_tag, bitmap);
return 0;