aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/sbgdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-03-17 21:43:39 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-03-17 21:46:10 +0100
commitc7e1e4c48aee1c873759c693bf4d093d362f4821 (patch)
tree4ae2436e1f0479170549baa049c999fb5ff3715d /libavformat/sbgdec.c
parent45f62c74dd40b0f2a83ac452c087fe0664d9e27b (diff)
parent423f5d50e499ab972f507115700c8f31ed8993e4 (diff)
downloadffmpeg-c7e1e4c48aee1c873759c693bf4d093d362f4821.tar.gz
Merge commit '423f5d50e499ab972f507115700c8f31ed8993e4'
* commit '423f5d50e499ab972f507115700c8f31ed8993e4': mov: Fix little endian audio detection Conflicts: libavformat/mov.c See: d2549ba9df1a1aac8c0ae19bfca2c81e508ba02e Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/sbgdec.c')
0 files changed, 0 insertions, 0 deletions