diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-06-13 04:25:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-06-13 04:39:58 +0200 |
| commit | 058d03631afcaa4eb8f61c80c920a192b27d1ca2 (patch) | |
| tree | 82510152837d93c0d3064facfc2cf5b33f6133fb /libavformat/adts.h | |
| parent | 21d5de930360bb29482aabd869074b9fd7b74ce3 (diff) | |
| parent | de859358830cfd1daffb1773f6bb069659027321 (diff) | |
| download | ffmpeg-058d03631afcaa4eb8f61c80c920a192b27d1ca2.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
cmdutils: add missing NULL check in parse_options()
x11grab: remove a memory allocation and the associated memcpy.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/adts.h')
0 files changed, 0 insertions, 0 deletions