ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Fri Aug 29
00:30:47 2014 +0200| [39cd9fdbf80292b3cf0aab20cacfdb18e85bb2b9] | committer:
Michael Niedermayer
Merge commit '4d686fb721b485ebbc4c7779d927d876c1e630f7'
* commit '4d686fb721b485ebbc4c7779d927d876c1e630f7':
matroskaenc: convert avstream stereo3d side data during encoding
Conflicts:
libavformat/matroskaenc.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=39cd9fdbf80292b3cf0aab20cacfdb18e85bb2b9
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
