diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-10 10:18:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-10 10:18:18 +0200 |
| commit | 296eaa84b9d0659b48014917f99032b3fa725302 (patch) | |
| tree | 5646cfaf430551b321c83e301cb69dbf76638cdb /libavformat/m4vdec.c | |
| parent | 69f543854deb8c31183b20ca72e10e78d3296f53 (diff) | |
| parent | 9d5ec50ead97e088d77317e77b18cef06cb3d053 (diff) | |
Merge commit '9d5ec50ead97e088d77317e77b18cef06cb3d053'
* commit '9d5ec50ead97e088d77317e77b18cef06cb3d053':
ff_socket: put out-of-line and fallback to fcntl() for close-on-exec
Conflicts:
libavformat/network.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/m4vdec.c')
0 files changed, 0 insertions, 0 deletions