[FFmpeg-cvslog] Merge commit 'b76249443864c88ffb2d41ab8d1de7432e985dc7'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Oct  7 02:39:58 2014 +0200| [4db0e8fd3366eadb2d6374b647b8738208749348] | committer: Michael Niedermayer

Merge commit 'b76249443864c88ffb2d41ab8d1de7432e985dc7'

* commit 'b76249443864c88ffb2d41ab8d1de7432e985dc7':
  sdp: Simplify parsing/conversion of H264 extradata

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

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