diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 13:14:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 13:21:56 +0100 |
| commit | f800cacada795018c2b7be1f0c0e637b2ee7aef7 (patch) | |
| tree | c4ae35bde00ce6c8de0ae629411dee110abd4516 /doc/ffmpeg-protocols.texi | |
| parent | 5227eac5b0408ea077ef7d1ff94ae35748fb012f (diff) | |
| parent | 3533a850e766f2333c28af4fac9b42e4da588708 (diff) | |
| download | ffmpeg-f800cacada795018c2b7be1f0c0e637b2ee7aef7.tar.gz | |
Merge remote-tracking branch 'qatar/release/10' into release/2.2
* qatar/release/10:
lavf: always use av_free
See: 88c8e4afeaf74ee58b67145e0331e229d8050968
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/ffmpeg-protocols.texi')
0 files changed, 0 insertions, 0 deletions