diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-18 19:54:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-18 19:54:04 +0100 |
| commit | 03a5c44faeceaf058ffe43c14d7d1a0d7c12da4c (patch) | |
| tree | e4abf4ca4d7b691dbe8928cdaf343f78532a87e9 /ffmpeg_filter.c | |
| parent | d8b4ba3c5a9cff9fdd36b03d600ad38e09608daf (diff) | |
| parent | fe533ffdcffadb3e55f07d0caf316bc6bfe82049 (diff) | |
| download | ffmpeg-03a5c44faeceaf058ffe43c14d7d1a0d7c12da4c.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Prepare release notes for Libav 10 "Eks"
Conflicts:
doc/RELEASE_NOTES
Not merged because all that stuff has been in past releases
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_filter.c')
0 files changed, 0 insertions, 0 deletions