Merge commit '148fbdd1c2a2a88a78ba9fd152c81c840bdb205a'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 20 Aug 2013 09:05:02 +0000 (11:05 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 20 Aug 2013 09:05:02 +0000 (11:05 +0200)
commit976de369ddeb395af6e0aad76f63aa1d37e14aac
treede5f801338cfae729c464eaf4c1b29a4c6c83ad4
parentd9b0b54a5f8bcd7f8fb01d6d008d3798a20dc43b
parent148fbdd1c2a2a88a78ba9fd152c81c840bdb205a
Merge commit '148fbdd1c2a2a88a78ba9fd152c81c840bdb205a'

* commit '148fbdd1c2a2a88a78ba9fd152c81c840bdb205a':
  mkv: Refactor mkv_write_packet

Conflicts:
libavformat/matroskaenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/matroskaenc.c