aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/vocenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-10-10 21:36:08 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-10-10 21:36:27 +0200
commit76d1ffffd0b2433c44ac48b8939337294566218b (patch)
tree30f90af9964dc65194f5567b0da1174f60314b2b /libavformat/vocenc.c
parent7028475f75336a11ca7bbfd30405d342eaa63354 (diff)
parent3df8d52fcdc9036b4074fdc612d487ece8bb5b7f (diff)
downloadffmpeg-76d1ffffd0b2433c44ac48b8939337294566218b.tar.gz
Merge commit '3df8d52fcdc9036b4074fdc612d487ece8bb5b7f'
* commit '3df8d52fcdc9036b4074fdc612d487ece8bb5b7f': rtsp: Add rtsps to the probe Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/vocenc.c')
0 files changed, 0 insertions, 0 deletions