diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-07 11:13:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-07 11:13:46 +0200 |
| commit | dce12f694864454c5e5a987bd3fa808e66268af4 (patch) | |
| tree | ca5563161729521bf27d6cffa5340eed9e29f1c0 /libavformat/rtmppkt.c | |
| parent | 2060d944090f10fb60e5c0ac42b7a946b9d5859f (diff) | |
| parent | 9cfa21c8c2b81146aab574f55c93f27e5c2d435c (diff) | |
| download | ffmpeg-dce12f694864454c5e5a987bd3fa808e66268af4.tar.gz | |
Merge commit '9cfa21c8c2b81146aab574f55c93f27e5c2d435c'
* commit '9cfa21c8c2b81146aab574f55c93f27e5c2d435c':
swscale: support endianness conversion for AV_PIX_FMT_XYZ12
Conflicts:
libswscale/swscale_unscaled.c
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtmppkt.c')
0 files changed, 0 insertions, 0 deletions