aboutsummaryrefslogtreecommitdiffstats
path: root/doc/print_options.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-08-01 11:06:38 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-08-01 11:29:03 +0200
commit161054f37b15893a5854874eed87bb4a4561d04a (patch)
treea66d7be22e87ebdcd5f4da093c7ee8f1998e48a9 /doc/print_options.c
parentbc47d126bf41b0ea0981a0f44336e2c782899db3 (diff)
parentc2e936de07d054bf476e60445b453bf6b4836820 (diff)
downloadffmpeg-161054f37b15893a5854874eed87bb4a4561d04a.tar.gz
Merge commit 'c2e936de07d054bf476e60445b453bf6b4836820'
* commit 'c2e936de07d054bf476e60445b453bf6b4836820': tree-test: Refactor and plug memory leaks Conflicts: libavutil/tree.c Most of this commit is not merged due to bugs in it Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/print_options.c')
0 files changed, 0 insertions, 0 deletions