[FFmpeg-cvslog] Merge commit '218d6844b37d339ffbf2044ad07d8be7767e2734'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug  8 12:38:10 2013 +0200| [c0f2ad3dbdeada7ba43b0510580467718f1334ca] | committer: Michael Niedermayer

Merge commit '218d6844b37d339ffbf2044ad07d8be7767e2734'

* commit '218d6844b37d339ffbf2044ad07d8be7767e2734':
  h264dsp: Factorize code into a new function, h264_find_start_code_candidate

Conflicts:
	libavcodec/h264_parser.c

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

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