diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-20 15:37:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-20 15:37:55 +0200 |
| commit | 8c320b3c0831b181585c8285e0b43d1a62fecc52 (patch) | |
| tree | 16267beba7d9dd713febef8916b280d2d39c96e4 /libavformat/rm.c | |
| parent | 391e272c163723a48609f1794f76064018847c0d (diff) | |
| parent | a9d50bb578ec04c085a25f1e023f75e0e4499d5e (diff) | |
| download | ffmpeg-8c320b3c0831b181585c8285e0b43d1a62fecc52.tar.gz | |
Merge commit 'a9d50bb578ec04c085a25f1e023f75e0e4499d5e'
* commit 'a9d50bb578ec04c085a25f1e023f75e0e4499d5e':
dcadec: Validate the lfe parameter
Conflicts:
libavcodec/dcadec.c
See: 3b2cd83a829e01a603b52fdc058a054b7899d06e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rm.c')
0 files changed, 0 insertions, 0 deletions