-
Michael Niedermayer authored
* commit 'ef196bee': mov: Refactor audio specific parsing in mov_parse_stsd_audio Conflicts: libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
9748f147
* commit 'ef196bee': mov: Refactor audio specific parsing in mov_parse_stsd_audio Conflicts: libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>