diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-03 13:38:28 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-03 13:39:23 +0200 |
commit | 44f079b27e8141c3871327c81d054777413fa49a (patch) | |
tree | a87d424eca7497f6be9b7b94193cce2fe2d900d6 /libavutil/random_seed.c | |
parent | 982920cfaa40d5b575225fc2baaf03f6250f7a03 (diff) | |
parent | cdab9db2adeec46b3984309c8c651bdd737d2b6b (diff) | |
download | ffmpeg-44f079b27e8141c3871327c81d054777413fa49a.tar.gz |
Merge commit 'cdab9db2adeec46b3984309c8c651bdd737d2b6b'
* commit 'cdab9db2adeec46b3984309c8c651bdd737d2b6b':
lavf: document av_dump_format()
Conflicts:
libavformat/avformat.h
See: 61f96be08a66e74897406fd64da4e61ea4b6a8c5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/random_seed.c')
0 files changed, 0 insertions, 0 deletions