[FFmpeg-cvslog] Merge commit '26179964ff3fa1173e6f512c5735ba8223e2395d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Sep 24 15:03:32 2013 +0200| [9c2e31c3b3a2a8ec9672bcda94512dd4f6ef301b] | committer: Michael Niedermayer

Merge commit '26179964ff3fa1173e6f512c5735ba8223e2395d'

* commit '26179964ff3fa1173e6f512c5735ba8223e2395d':
  h264_sei: log unknown sei messages

Conflicts:
	libavcodec/h264_sei.c

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

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