[FFmpeg-cvslog] Merge commit '103d073dd7ce23b912df32be8c9524ba25dd5991'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Oct 22 19:17:18 2013 +0200| [4aeafbaab891d81c377f92be3969d8d3e6abf379] | committer: Michael Niedermayer

Merge commit '103d073dd7ce23b912df32be8c9524ba25dd5991'

* commit '103d073dd7ce23b912df32be8c9524ba25dd5991':
  h264_parser: Use ff_h264_reset_sei()

Conflicts:
	libavcodec/h264_parser.c

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

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