diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-15 14:04:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-15 14:09:35 +0200 |
| commit | ae237a117acbe958bea798e32249f4c2baeca5f9 (patch) | |
| tree | c45fc400e59ab03d5346a82580bfc2054b9efe0f /libavformat/webvttdec.c | |
| parent | 4f5e5a05132be4946a655b991850bf81b7497893 (diff) | |
| parent | 95cd815c3663603871a1f2da95846e8f72d4ea96 (diff) | |
| download | ffmpeg-ae237a117acbe958bea798e32249f4c2baeca5f9.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
swscale: try to use mmap only if available
configure: check for mprotect
wmapro: use planar sample format
wmalossless: output in planar sample format
wmadec: use float planar sample format output
shorten: use planar sample format
lavc: update documentation for AVFrame.extended_data
Conflicts:
libavcodec/shorten.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/webvttdec.c')
0 files changed, 0 insertions, 0 deletions