diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-17 11:05:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-17 11:05:18 +0200 |
| commit | c7078f4907dcff6877cf38f48526788c10644f07 (patch) | |
| tree | 2f736c10d8bd2b164e060adbf8335195daa0cb1a /libavresample/audio_mix_matrix.c | |
| parent | d5e5e73c52d3e2e1d853b2d485223d3c7b01da4f (diff) | |
| parent | 4c205f42c86ccefa093c59434669af34ad14a52b (diff) | |
| download | ffmpeg-c7078f4907dcff6877cf38f48526788c10644f07.tar.gz | |
Merge commit '4c205f42c86ccefa093c59434669af34ad14a52b'
* commit '4c205f42c86ccefa093c59434669af34ad14a52b':
vf_drawbox: make config_props work properly when called multiple times.
vf_drawtext: do not reset the frame number in config_input.
vf_fps: move initializing pts from config_props to init.
Conflicts:
libavfilter/vf_drawbox.c
libavfilter/vf_drawtext.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/audio_mix_matrix.c')
0 files changed, 0 insertions, 0 deletions