[FFmpeg-cvslog] Merge commit '148fbdd1c2a2a88a78ba9fd152c81c840bdb205a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Aug 20 11:05:02 2013 +0200| [976de369ddeb395af6e0aad76f63aa1d37e14aac] | committer: Michael Niedermayer

Merge commit '148fbdd1c2a2a88a78ba9fd152c81c840bdb205a'

* commit '148fbdd1c2a2a88a78ba9fd152c81c840bdb205a':
  mkv: Refactor mkv_write_packet

Conflicts:
	libavformat/matroskaenc.c

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

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