diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-17 21:00:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-17 21:00:04 +0100 |
| commit | 15cd2a93e7f64b5b4e4367014a78ee8f9e63c2bb (patch) | |
| tree | 4fd2849df326b20ef08fd8824e98becf05752670 /ffplay.c | |
| parent | 9d5017a20c26b98bdd6fec29f3eaa465a779e24c (diff) | |
| parent | 81688e68f93f3142e2093f1a3d226edaeb179992 (diff) | |
Merge commit '81688e68f93f3142e2093f1a3d226edaeb179992'
* commit '81688e68f93f3142e2093f1a3d226edaeb179992':
avconv: Check rc_override memory allocation
Conflicts:
ffmpeg_opt.c
See: 7efabffc2899b76688a40b4bd7c63370eb2d8ca8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffplay.c')
0 files changed, 0 insertions, 0 deletions