aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/network.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-09-29 21:02:45 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-09-29 21:05:20 +0200
commit56c47364c3b50c66c54b3372650f7fd542d998bb (patch)
treeb647083fa0d11fd6c80de3cf1c273967ae18c5a3 /libavformat/network.h
parent46807921f768477c9339ad92a785cc64d9407d20 (diff)
parent2cd7c99498b1bcb450c328459cf85a686ce83456 (diff)
downloadffmpeg-56c47364c3b50c66c54b3372650f7fd542d998bb.tar.gz
Merge commit '2cd7c99498b1bcb450c328459cf85a686ce83456'
* commit '2cd7c99498b1bcb450c328459cf85a686ce83456': h264: reset ret to avoid propagating minor failures See: 47048aa30b5c35fc8b030e819b9769b6bca03c08 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/network.h')
0 files changed, 0 insertions, 0 deletions