Merge commit '4d686fb721b485ebbc4c7779d927d876c1e630f7'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Aug 2014 22:30:47 +0000 (00:30 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Aug 2014 22:44:47 +0000 (00:44 +0200)
commit39cd9fdbf80292b3cf0aab20cacfdb18e85bb2b9
tree489589a04d5684229f58615bd83bc5bd37948622
parentfcc39099087e156196e3444ef479b2c778566405
parent4d686fb721b485ebbc4c7779d927d876c1e630f7
Merge commit '4d686fb721b485ebbc4c7779d927d876c1e630f7'

* commit '4d686fb721b485ebbc4c7779d927d876c1e630f7':
  matroskaenc: convert avstream stereo3d side data during encoding

Conflicts:
libavformat/matroskaenc.c

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