diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-15 22:29:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-15 22:30:53 +0200 |
| commit | 12e36a3dfdc619fcb479ae10e73679d69b19b2d7 (patch) | |
| tree | 42b57f0395b81a30dc496e215c3ebe933101e794 /libavfilter/af_afade.c | |
| parent | 20526f2e2f58cb226e9891aec7d7e438a7ddb6d2 (diff) | |
| parent | a4fbd55d6e03eabdbecc3b7892ec09eb8062d066 (diff) | |
| download | ffmpeg-12e36a3dfdc619fcb479ae10e73679d69b19b2d7.tar.gz | |
Merge commit 'a4fbd55d6e03eabdbecc3b7892ec09eb8062d066'
* commit 'a4fbd55d6e03eabdbecc3b7892ec09eb8062d066':
h264: er: Copy from the previous reference only if compatible
See: fdc64a104410f5fcc7f35b62287b0ae502b7061a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_afade.c')
0 files changed, 0 insertions, 0 deletions