diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-16 03:00:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-16 03:00:17 +0100 |
| commit | 8796c3b7d3e2904d7bc8ebfe261b53c263098935 (patch) | |
| tree | dae3ffc8feb8587e2b68fa32776da49a311c9754 /libavutil/file_open.c | |
| parent | 7430f3064fef57ee12bfd8478c239c923096f224 (diff) | |
| parent | 738d68de85714608ad1e68fc9eab5dc0bfdda598 (diff) | |
| download | ffmpeg-8796c3b7d3e2904d7bc8ebfe261b53c263098935.tar.gz | |
Merge commit '738d68d' into release/2.2
* commit '738d68d':
http: Drop doxy comments
Conflicts:
libavformat/http.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/file_open.c')
0 files changed, 0 insertions, 0 deletions