summaryrefslogtreecommitdiff
path: root/libswscale/swscale_unscaled.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-12-06 01:01:06 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-12-06 01:23:09 +0100
commit95482092b1e57987e079cd94b06e875f4d19d762 (patch)
tree63e19aed7c22b78fda4e17ac77a1be0b49bf3160 /libswscale/swscale_unscaled.c
parent8616c5b75acf91871e281e730f53e3de617484f1 (diff)
parent8c0a865ad96b9e8542051f75b0edc424cb73994e (diff)
Merge commit '8c0a865ad96b9e8542051f75b0edc424cb73994e'
* commit '8c0a865ad96b9e8542051f75b0edc424cb73994e': mov: skip version and flags attributes in mov_read_chan() See: 59d40fc7e66e6ebb2d89e25115492bfe13b07d95 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/swscale_unscaled.c')
0 files changed, 0 insertions, 0 deletions