diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-04 23:46:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-04 23:46:44 +0200 |
| commit | ebd74c42a259b77b549a9135c1099921de5d3e0e (patch) | |
| tree | bb37ebf66a920fb6059b2a159a8dca21e3ca3374 /libavformat/mpeg.h | |
| parent | 0597f052372b9e5877af7ad8b1e632d511931db6 (diff) | |
| parent | 1f5678c5e404ebd326f6eae1b527beadaa85a528 (diff) | |
| download | ffmpeg-ebd74c42a259b77b549a9135c1099921de5d3e0e.tar.gz | |
Merge commit '1f5678c5e404ebd326f6eae1b527beadaa85a528' into release/1.1
* commit '1f5678c5e404ebd326f6eae1b527beadaa85a528':
Update Changelog for v9.13
Conflicts:
Changelog
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpeg.h')
0 files changed, 0 insertions, 0 deletions