diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-04 02:15:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-04 02:15:27 +0200 |
| commit | 241913c0d041e09ddded851a47e0a4a7d6f88561 (patch) | |
| tree | ca2b02ee6dec76a51325594c52aa645d58c3fc3b /libavformat/hls.c | |
| parent | 333eb37a967a6e5299e63adaadec3bb9b8b2bbbd (diff) | |
| parent | c4367f950d5bc8a3a2979182d5aef7bd94949f93 (diff) | |
| download | ffmpeg-241913c0d041e09ddded851a47e0a4a7d6f88561.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Fix codec fps diplay for very small fps.
lavf/mpeg: Support alaw in Hikvision CCTV recordings.
lavf/mpeg: Support more audio codecs in Hikvision CCTV recordings.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/hls.c')
0 files changed, 0 insertions, 0 deletions