aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/utils.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-03-10 14:13:56 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-03-10 14:13:56 +0100
commit9e835572f80b6ab82a07206ac302637039e671da (patch)
tree4cdac266858beab5ada86ae53f1cbe5d13e9e5e8 /libavformat/utils.c
parentd7a8d07fd81cc0a6e1ecc9e5fee4ebcd93d975bc (diff)
parent798b3ed3fbc31672e6400e18db37deef03fff44f (diff)
downloadffmpeg-9e835572f80b6ab82a07206ac302637039e671da.tar.gz
Merge commit '798b3ed3fbc31672e6400e18db37deef03fff44f' into release/1.1
* commit '798b3ed3fbc31672e6400e18db37deef03fff44f': doc: More changelog updates for v9.18 Conflicts: Changelog not merged Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/utils.c')
0 files changed, 0 insertions, 0 deletions