diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-20 01:10:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-20 01:10:06 +0100 |
| commit | 750cf4e5374caeef1f5174953d5b159d92abfe86 (patch) | |
| tree | e11f16d94bc570a757a7e03acd0920ea62927d28 /libavdevice/opengl_enc.c | |
| parent | 519868de7d9c99876efcaf57d6a9683c22732cde (diff) | |
| parent | cf18e777aed9f73011c7ab7cbab8003189d4b9d8 (diff) | |
| download | ffmpeg-750cf4e5374caeef1f5174953d5b159d92abfe86.tar.gz | |
Merge commit 'cf18e777aed9f73011c7ab7cbab8003189d4b9d8'
* commit 'cf18e777aed9f73011c7ab7cbab8003189d4b9d8':
movenc: write the display transform matrix
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/opengl_enc.c')
0 files changed, 0 insertions, 0 deletions