diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-29 00:30:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-29 00:44:47 +0200 |
| commit | 39cd9fdbf80292b3cf0aab20cacfdb18e85bb2b9 (patch) | |
| tree | 489589a04d5684229f58615bd83bc5bd37948622 /libavcodec/hpeldsp.c | |
| parent | fcc39099087e156196e3444ef479b2c778566405 (diff) | |
| parent | 4d686fb721b485ebbc4c7779d927d876c1e630f7 (diff) | |
| download | ffmpeg-39cd9fdbf80292b3cf0aab20cacfdb18e85bb2b9.tar.gz | |
Merge commit '4d686fb721b485ebbc4c7779d927d876c1e630f7'
* commit '4d686fb721b485ebbc4c7779d927d876c1e630f7':
matroskaenc: convert avstream stereo3d side data during encoding
Conflicts:
libavformat/matroskaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hpeldsp.c')
0 files changed, 0 insertions, 0 deletions