summaryrefslogtreecommitdiff
path: root/libavformat/rdt.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-12-05 23:49:56 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-12-06 00:37:25 +0100
commita0d0799ea2a79c6b598541248fe24083265cf336 (patch)
tree39dc8371c0962071d09fe4f6d3272d5e8063f154 /libavformat/rdt.c
parent53b2809f2c1b942adf4d876ac446ef97f812ac0c (diff)
parent1eec9bfc383f6dca29d83a2bfb45433dd66561c9 (diff)
Merge commit '1eec9bfc383f6dca29d83a2bfb45433dd66561c9'
* commit '1eec9bfc383f6dca29d83a2bfb45433dd66561c9': APIchanges: mark the release 11 branch point Conflicts: doc/APIchanges Not merged as the contents in our APIchanges differ and it could be confusing Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rdt.c')
0 files changed, 0 insertions, 0 deletions