Merge commit 'ef196beeb50e8e024ed5a560a1d39eff4a296ce4'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 26 Aug 2013 11:14:09 +0000 (13:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 26 Aug 2013 11:14:09 +0000 (13:14 +0200)
commit9748f1477de2c5e5a892da2b80475ca193bd8d2e
tree2e48bfb34520d82faa96d4f9d075268d4a3a6540
parentbc6370b622276c5603d6e32e3939f8b7fb3a4b35
parentef196beeb50e8e024ed5a560a1d39eff4a296ce4
Merge commit 'ef196beeb50e8e024ed5a560a1d39eff4a296ce4'

* commit 'ef196beeb50e8e024ed5a560a1d39eff4a296ce4':
  mov: Refactor audio specific parsing in mov_parse_stsd_audio

Conflicts:
libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/mov.c