[FFmpeg-cvslog] Merge commit 'c3311d472a7528c67f76d0d061704ae70a99b32e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May 18 14:14:33 2014 +0200| [4f32efdff007024869ab2755c9223c159ace4442] | committer: Michael Niedermayer

Merge commit 'c3311d472a7528c67f76d0d061704ae70a99b32e'

* commit 'c3311d472a7528c67f76d0d061704ae70a99b32e':
  avienc: sanitize variable naming in write_header()

Conflicts:
	libavformat/avienc.c

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

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