diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-25 12:09:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-25 12:09:29 +0200 |
| commit | f1b04f803eafa17dbfa19977b1a76f412183478e (patch) | |
| tree | de048785399523e5004fff4b517ed9394e794e43 /libavformat/avformat.h | |
| parent | a2841d92c384e345cbbeffab72406405a0d9410c (diff) | |
| parent | 6ca11f7157d0ffd11ea9a4211b04981b46dc75d6 (diff) | |
| download | ffmpeg-f1b04f803eafa17dbfa19977b1a76f412183478e.tar.gz | |
Merge commit '6ca11f7157d0ffd11ea9a4211b04981b46dc75d6'
* commit '6ca11f7157d0ffd11ea9a4211b04981b46dc75d6':
doc/APIchanges: fill in missing hashes and dates
Conflicts:
doc/APIchanges
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avformat.h')
0 files changed, 0 insertions, 0 deletions