[FFmpeg-cvslog] Merge commit 'c63dd3f0a48a9f6389d253597ab51caddc0118db'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec 19 04:21:13 2014 +0100| [ff4f2036defbadc60081ba252e093abda5897d6d] | committer: Michael Niedermayer

Merge commit 'c63dd3f0a48a9f6389d253597ab51caddc0118db'

* commit 'c63dd3f0a48a9f6389d253597ab51caddc0118db':
  a64multi: check elbg return values

Conflicts:
	libavcodec/a64multienc.c

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

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