aboutsummaryrefslogtreecommitdiffstats
path: root/libswresample/resample_template.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-06-02 00:32:06 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-06-02 00:32:30 +0200
commite91f27cbbb276bbdc9f7bc18e69e9b5fe6d16387 (patch)
treebf0aabff9f89a43d370a7200b935b4d469022dac /libswresample/resample_template.c
parent6b9cbc9a1164988b3517f4f160f7937e1644cdc3 (diff)
parent59cb5747ec3c5cd842b94e574c37889521c97cc4 (diff)
downloadffmpeg-e91f27cbbb276bbdc9f7bc18e69e9b5fe6d16387.tar.gz
Merge commit '59cb5747ec3c5cd842b94e574c37889521c97cc4'
* commit '59cb5747ec3c5cd842b94e574c37889521c97cc4': rtmpproto: read metadata to set correct FLV header Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/resample_template.c')
0 files changed, 0 insertions, 0 deletions