diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-17 21:42:49 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-17 21:43:06 +0200 |
commit | c939eea107c36b4ab93540f24fdb1cb5417a0eae (patch) | |
tree | 3414c8aff3addad4af63001d3689f1b1ca11a51a /libavformat/hls.c | |
parent | eb706575baa646d3d2400d85a521386a4df3d979 (diff) | |
parent | 11db644a8e54f02e54d2eaad343a87fcb697c15e (diff) | |
download | ffmpeg-c939eea107c36b4ab93540f24fdb1cb5417a0eae.tar.gz |
Merge commit '11db644a8e54f02e54d2eaad343a87fcb697c15e'
* commit '11db644a8e54f02e54d2eaad343a87fcb697c15e':
lavr: Update the planar check in ff_audio_convert
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/hls.c')
0 files changed, 0 insertions, 0 deletions