diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-07 10:59:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-07 11:04:07 +0200 |
| commit | 2060d944090f10fb60e5c0ac42b7a946b9d5859f (patch) | |
| tree | bb3f3548cd807a25de3a5cb5e6140f4e00c6e58b /libavformat/nutenc.c | |
| parent | 60fd88059a62c9237893ff6d159c28cd929aadf0 (diff) | |
| parent | c1eb3e7fecdc270e03a700d61ef941600a6af491 (diff) | |
| download | ffmpeg-2060d944090f10fb60e5c0ac42b7a946b9d5859f.tar.gz | |
Merge commit 'c1eb3e7fecdc270e03a700d61ef941600a6af491'
* commit 'c1eb3e7fecdc270e03a700d61ef941600a6af491':
swscale: add support for endianness only conversion
Conflicts:
libswscale/utils.c
libswscale/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/nutenc.c')
0 files changed, 0 insertions, 0 deletions