[FFmpeg-cvslog] Merge commit '6451c8853a07ff2e28bda950fb5e83fcf88c5cf4'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Dec 14 22:24:03 2013 +0100| [09c13ff7bdbc9cb6e1e33aae6c61b53ef0d426b7] | committer: Michael Niedermayer

Merge commit '6451c8853a07ff2e28bda950fb5e83fcf88c5cf4'

* commit '6451c8853a07ff2e28bda950fb5e83fcf88c5cf4':
  sdp: Check theora colorspace before producing the configuration string

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

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