Merge commit '30b8eb0f87b0eaefdc115ef38f8ad87dd3a6e50b'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Nov 2014 12:09:49 +0000 (13:09 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Nov 2014 12:10:16 +0000 (13:10 +0100)
* commit '30b8eb0f87b0eaefdc115ef38f8ad87dd3a6e50b':
  sol: simplify sol_codec_id()

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

Simple merge