diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-14 02:19:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-14 02:19:58 +0200 |
| commit | 58c03f6d7d6eabdbc25103e8229a06ddf3718bb9 (patch) | |
| tree | 9796a7be60b1b305a4e0235ffde5ede275f740b8 /doc/examples/muxing-example.c | |
| parent | 01d3ebaf219d83c0a70cdf9696ecb6b868e8a165 (diff) | |
| parent | 9f54e461fecec7a97ec1b97ae4468135ea770609 (diff) | |
| download | ffmpeg-58c03f6d7d6eabdbc25103e8229a06ddf3718bb9.tar.gz | |
Merge remote branch 'qatar/master'
* qatar/master:
swscale: properly inline bits/endianness in yuv2yuvX16inC().
(We didnt pull the bug) swscale: fix clipping of 9/10bit YUV420P.
Add av_clip_uintp2() function
(our patch / duplicate) dfa: fix buffer overflow checks to avoid integer overflows.
(our patch / duplicate) movenc: always write esds descriptor length using 4 bytes.
(our patch / duplicate) ffmpeg: use parse_number_and_die() when it makes sense
(No thanks) ffmpeg: get rid of the 'q' key schizofrenia
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/examples/muxing-example.c')
0 files changed, 0 insertions, 0 deletions