[FFmpeg-cvslog] Merge commit '43fd3dd80ca2d1c2ccf6a7b7632db544c809c690'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Apr  5 21:11:25 2015 +0200| [14d241b19dcde7808de7c3c631886f25f91f2008] | committer: Michael Niedermayer

Merge commit '43fd3dd80ca2d1c2ccf6a7b7632db544c809c690'

* commit '43fd3dd80ca2d1c2ccf6a7b7632db544c809c690':
  h264: drop redundant initialization in init()

Conflicts:
	libavcodec/h264.c

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

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