aboutsummaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-11-17 11:20:32 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-11-17 11:20:32 +0100
commitf1b20930f206349a666ec314d76c3fcb86c6b9a7 (patch)
treea8a94489ff233ad1b5704eeec083110723761c78 /README.md
parent7cbe1e044701898aadda9958ddb67f6ea95fc72b (diff)
parent2c6a7f9348378f887066fb1669c46b9485e8ef3e (diff)
downloadffmpeg-f1b20930f206349a666ec314d76c3fcb86c6b9a7.tar.gz
Merge commit '2c6a7f9348378f887066fb1669c46b9485e8ef3e'
* commit '2c6a7f9348378f887066fb1669c46b9485e8ef3e': hevc: do not store rqt_root_cbf in the context Conflicts: libavcodec/hevc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'README.md')
0 files changed, 0 insertions, 0 deletions