[FFmpeg-cvslog] Merge commit 'ef196beeb50e8e024ed5a560a1d39eff4a296ce4'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Aug 26 13:14:09 2013 +0200| [9748f1477de2c5e5a892da2b80475ca193bd8d2e] | committer: Michael Niedermayer

Merge commit 'ef196beeb50e8e024ed5a560a1d39eff4a296ce4'

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

Conflicts:
	libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9748f1477de2c5e5a892da2b80475ca193bd8d2e
---