diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-10 22:09:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-10 22:09:48 +0200 |
| commit | 8b0ceb96da0e615e6c7e6ed11da5035c0506dadb (patch) | |
| tree | 2a192b1a5b06edf7c2563592018e89d2061db072 /libavfilter/vf_pad.c | |
| parent | ce1c0e99e9f66616bcbdbc2de8ca077bdfa03aa7 (diff) | |
| parent | b34257eefd98cb768ea2f53a390b8684d51e689a (diff) | |
| download | ffmpeg-8b0ceb96da0e615e6c7e6ed11da5035c0506dadb.tar.gz | |
Merge commit 'b34257eefd98cb768ea2f53a390b8684d51e689a'
* commit 'b34257eefd98cb768ea2f53a390b8684d51e689a':
nut: Check chapter creation in decode_info_header
Conflicts:
libavformat/nutdec.c
See: 3ff1af2b0db7132d5717be6395227a94c8abab07
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_pad.c')
0 files changed, 0 insertions, 0 deletions