diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-24 20:53:26 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-24 20:57:45 +0200 |
commit | 87544ce8dcf9ed26ca3b5959407d0ba8c8ad5233 (patch) | |
tree | 680512128bfa4ae478e4c7a0c34b5810c34c8bc2 /libavformat/file_open.c | |
parent | 41070923490a678911435fb1d65bba04c6bf2a5e (diff) | |
parent | 4d55484391112a30d16812597b9ad81605af0c24 (diff) | |
download | ffmpeg-87544ce8dcf9ed26ca3b5959407d0ba8c8ad5233.tar.gz |
Merge commit '4d55484391112a30d16812597b9ad81605af0c24'
* commit '4d55484391112a30d16812597b9ad81605af0c24':
dds: Fix palette mode on big endian
Conflicts:
libavcodec/dds.c
See: 21d2e3d602dc5f173901ba51f6a237b9dfce9e8e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/file_open.c')
0 files changed, 0 insertions, 0 deletions