diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-11 22:50:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-11 22:50:00 +0100 |
| commit | 22377751c9676849ea554b9220870df9dd344f7d (patch) | |
| tree | 477bf83205e13f8696ff6833341445b9c7de5acf /doc/examples/muxing.c | |
| parent | cb4da0405d3453d9a7cf55237a44e8f8939f4be4 (diff) | |
| parent | 905988fe1a8accbc1ab93120aa4cd29252b81cce (diff) | |
| download | ffmpeg-22377751c9676849ea554b9220870df9dd344f7d.tar.gz | |
Merge commit '905988fe1a8accbc1ab93120aa4cd29252b81cce' into release/0.10
* commit '905988fe1a8accbc1ab93120aa4cd29252b81cce':
eamad: check for out of bounds read
Conflicts:
libavcodec/eamad.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/examples/muxing.c')
0 files changed, 0 insertions, 0 deletions