Merge commit 'b76249443864c88ffb2d41ab8d1de7432e985dc7'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 7 Oct 2014 00:39:58 +0000 (02:39 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 7 Oct 2014 00:40:02 +0000 (02:40 +0200)
commit4db0e8fd3366eadb2d6374b647b8738208749348
tree9505a97f859c1e8df48f1e48722830e65a018c49
parenta52384dcdab26e5925a44c0f5fd4b1c5ac5920fe
parentb76249443864c88ffb2d41ab8d1de7432e985dc7
Merge commit 'b76249443864c88ffb2d41ab8d1de7432e985dc7'

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

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