aboutsummaryrefslogtreecommitdiffstats
path: root/tests/ref/lavf/flv_fmt
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-08-10 10:18:18 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-08-10 10:18:18 +0200
commit296eaa84b9d0659b48014917f99032b3fa725302 (patch)
tree5646cfaf430551b321c83e301cb69dbf76638cdb /tests/ref/lavf/flv_fmt
parent69f543854deb8c31183b20ca72e10e78d3296f53 (diff)
parent9d5ec50ead97e088d77317e77b18cef06cb3d053 (diff)
downloadffmpeg-296eaa84b9d0659b48014917f99032b3fa725302.tar.gz
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 'tests/ref/lavf/flv_fmt')
0 files changed, 0 insertions, 0 deletions