aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/vivo.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-07-28 13:35:51 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-07-28 13:54:51 +0200
commit4a73fa19ca7ac74f16422eabf731b86796b7d588 (patch)
treefd210de29e3580c5787668a802dc4b7eb0028451 /libavformat/vivo.c
parent0a1ffc57882c467b6573b23f1d206aa87caf0025 (diff)
parent4aa80808bcc2a30fcd7ce5b38594319df3a85b36 (diff)
downloadffmpeg-4a73fa19ca7ac74f16422eabf731b86796b7d588.tar.gz
Merge commit '4aa80808bcc2a30fcd7ce5b38594319df3a85b36'
* commit '4aa80808bcc2a30fcd7ce5b38594319df3a85b36': hevc: eliminate unnecessary cbf_c{b,r} arrays Conflicts: libavcodec/hevc.c See: 77ef9fd1e938010600620c1d32cabd15e7d5b853 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/vivo.c')
0 files changed, 0 insertions, 0 deletions