diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-27 12:52:12 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-27 12:52:17 +0200 |
commit | 231201382ea0697b9e29fabcd7996db719ea8b9a (patch) | |
tree | c85ee5f3bc493d1fb3ad89c7de4b179d52f56378 /libavfilter/filtfmts.c | |
parent | da2038221bc68e28edaaeddecff8d48cce2c9e52 (diff) | |
parent | 0fb3e1c6ce50ae4366c7e5571f2a8278d7fd6297 (diff) | |
download | ffmpeg-231201382ea0697b9e29fabcd7996db719ea8b9a.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
movenc: Check for errors from mov_create_chapter_track
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/filtfmts.c')
0 files changed, 0 insertions, 0 deletions