[FFmpeg-cvslog] Merge commit 'dc518a3ae21e7b6420131b813cfc6bcdcad26b7e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Aug 26 13:18:34 2013 +0200| [80e05994025ec40076e40388fcd9361a5f64a519] | committer: Michael Niedermayer

Merge commit 'dc518a3ae21e7b6420131b813cfc6bcdcad26b7e'

* commit 'dc518a3ae21e7b6420131b813cfc6bcdcad26b7e':
  mov: Refactor subtitle specific parsing in mov_parse_stsd_subtitle

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

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