diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-02 22:07:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-02 22:08:11 +0200 |
| commit | e874772f70908ad5b1754c0373a35bec08fad547 (patch) | |
| tree | c8b46d7ef5123cc18cb2114688246bc35c07dee5 /.gitattributes | |
| parent | 94f4bdc4f146bcfa46be341d5aab3221af4cdd57 (diff) | |
| parent | 21180b73239c6360aa28496d4879713b7ba4a8e5 (diff) | |
| download | ffmpeg-e874772f70908ad5b1754c0373a35bec08fad547.tar.gz | |
Merge commit '21180b73239c6360aa28496d4879713b7ba4a8e5'
* commit '21180b73239c6360aa28496d4879713b7ba4a8e5':
avplay: Factorize code for adding filters to the filter pipeline
Conflicts:
ffplay.c
See: 08c51e12b1c3f3e3e68e33eb46be7131df5b3682
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions