diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-05 04:05:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-05 04:05:48 +0200 |
| commit | 77b789b4063578e14d59c970b21597739c7f9fd1 (patch) | |
| tree | 46fb8a64128d22cc7339682a3d9516ed6ea2c908 /libavformat/gopher.c | |
| parent | 9ed1aa0465b3377dec860bcfe8144533b9ea9d68 (diff) | |
| parent | 07015d9f913d63bdc4495e75f4603c586553796e (diff) | |
| download | ffmpeg-77b789b4063578e14d59c970b21597739c7f9fd1.tar.gz | |
Merge commit '07015d9f913d63bdc4495e75f4603c586553796e' into release/2.2
* commit '07015d9f913d63bdc4495e75f4603c586553796e':
Update Changelog for v10.3
Conflicts:
Changelog
Not merged as it does not match our release
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/gopher.c')
0 files changed, 0 insertions, 0 deletions