aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-05-05 10:36:23 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-05-05 10:36:23 +0200
commit336ffb837705810682423b4d411c20170e56b923 (patch)
tree1323cc87ff2707265d8887694ff5ada164dcca1a /libavcodec
parentfbede75a2580ed3561128fcaef206f58be3b010f (diff)
parent95e8ac60f8b7317ce23c648250fdc8fb68d65a07 (diff)
downloadffmpeg-336ffb837705810682423b4d411c20170e56b923.tar.gz
Merge commit '95e8ac60f8b7317ce23c648250fdc8fb68d65a07'
* commit '95e8ac60f8b7317ce23c648250fdc8fb68d65a07': build: normalize coverage.info Conflicts: tests/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
0 files changed, 0 insertions, 0 deletions