diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 01:39:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 01:40:01 +0100 |
| commit | c7831e55b517b44c58e64dddfdde3e542873abfd (patch) | |
| tree | 4123c42ef7b81037809f24b4790e194c0ec73926 /libavfilter/af_asetrate.c | |
| parent | 6f9bb83dbb93bc3bb25d23a342fb85c2eb99298e (diff) | |
| parent | 242fc6394fecb403bcbd0f652920f2647d0b08ae (diff) | |
| download | ffmpeg-c7831e55b517b44c58e64dddfdde3e542873abfd.tar.gz | |
Merge commit '242fc6394fecb403bcbd0f652920f2647d0b08ae' into release/2.4
* commit '242fc6394fecb403bcbd0f652920f2647d0b08ae':
mtv: improve header check and avoid division by zero
Conflicts:
libavformat/mtv.c
See: 8b9b6332dfeb169098c8ab1351d66fc5b474dd55
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_asetrate.c')
0 files changed, 0 insertions, 0 deletions