diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-02 12:40:20 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-02 12:40:20 +0100 |
| commit | 309609ce4d75a7ff10c8c8a7b710f2bbb3eb99b3 (patch) | |
| tree | f3d730fa6df134b69c94058c80b91824ac8790f8 /doc/examples/avio_reading.c | |
| parent | 6607057d0e037f9bc87136210bcc681313738e57 (diff) | |
| parent | 60ccc1a748bf3d26201411479146d0798e1ecff9 (diff) | |
| download | ffmpeg-309609ce4d75a7ff10c8c8a7b710f2bbb3eb99b3.tar.gz | |
Merge commit '60ccc1a748bf3d26201411479146d0798e1ecff9' into release/2.4
* commit '60ccc1a748bf3d26201411479146d0798e1ecff9':
Update changelog for v11.1
Conflicts:
Changelog
Not merged, the changelog does not match FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/examples/avio_reading.c')
0 files changed, 0 insertions, 0 deletions