[FFmpeg-cvslog] Merge commit '0d8b943d204bd16fcf2f4a59c742e65a401dd3d0'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Aug  3 08:54:54 2013 +0200| [7cd13f618c3cf47c21ec8128ed61f16a14c349ef] | committer: Michael Niedermayer

Merge commit '0d8b943d204bd16fcf2f4a59c742e65a401dd3d0'

* commit '0d8b943d204bd16fcf2f4a59c742e65a401dd3d0':
  h264_sei: Return meaningful values

Conflicts:
	libavcodec/h264_sei.c

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

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