[FFmpeg-cvslog] Merge commit '28c020d4df9b060a58a124a7a5406d4313fbe249'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Oct 25 04:45:23 2014 +0200| [8be93ba049f1bb62ce03a86f7d9a8a49934b9ff8] | committer: Michael Niedermayer

Merge commit '28c020d4df9b060a58a124a7a5406d4313fbe249'

* commit '28c020d4df9b060a58a124a7a5406d4313fbe249':
  matroskaenc: check avio_open_dyn_buf return value

Conflicts:
	libavformat/matroskaenc.c

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

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