aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/riff.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-07-23 21:30:28 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-07-23 21:30:28 +0200
commitc6965f62a2e34667814ab1854a9f127e2ea54efa (patch)
tree758ca9fb6d0844c0b0703053c951b3636f0c7e62 /libavformat/riff.c
parent64539e12132cb5058042f7e276cea9bc44873026 (diff)
parent44f7df0c987965763c609f6dc36974b04182e58d (diff)
downloadffmpeg-c6965f62a2e34667814ab1854a9f127e2ea54efa.tar.gz
Merge commit '44f7df0c987965763c609f6dc36974b04182e58d'
* commit '44f7df0c987965763c609f6dc36974b04182e58d': dds: Write the palette in the native endian form Conflicts: libavcodec/dds.c See: 36a87c2dc7f302da3778bd0cff050b5c93a730c7 Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/riff.c')
0 files changed, 0 insertions, 0 deletions