aboutsummaryrefslogtreecommitdiffstats
path: root/libavresample/audio_convert.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-10-17 15:34:24 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-10-17 15:34:27 +0200
commit3dda0bbe4250f11a3bd3edd2e6da4b2cda070f50 (patch)
tree7d42a6bed030864e0ebcbff5b3ca582d079b574a /libavresample/audio_convert.c
parent6cf9d02cea5e9ebc46ae037eb003a9353a38f5b1 (diff)
parente65c776d18dc14df8a279e017760862f9fc8763b (diff)
downloadffmpeg-3dda0bbe4250f11a3bd3edd2e6da4b2cda070f50.tar.gz
Merge commit 'e65c776d18dc14df8a279e017760862f9fc8763b'
* commit 'e65c776d18dc14df8a279e017760862f9fc8763b': rtmpproto: Add getStreamLength call to query duration Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/audio_convert.c')
0 files changed, 0 insertions, 0 deletions