diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-04 20:42:33 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-04 20:47:14 +0100 |
| commit | 735ab7c5e04e2316afbd56643c13de17a7ac89cd (patch) | |
| tree | bf15e7c1c9dd07512a35d7a9ecd654126753b82b /libavformat/srtenc.c | |
| parent | b5ca158935493f7242806f1bc59ea016672a1844 (diff) | |
| parent | e767c9e8f2eaa116b61b8b6881b401b54bd320f5 (diff) | |
| download | ffmpeg-735ab7c5e04e2316afbd56643c13de17a7ac89cd.tar.gz | |
Merge commit 'e767c9e8f2eaa116b61b8b6881b401b54bd320f5'
* commit 'e767c9e8f2eaa116b61b8b6881b401b54bd320f5':
flv: Validate and reject unsupported codecs
Conflicts:
libavformat/flvenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/srtenc.c')
0 files changed, 0 insertions, 0 deletions