diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-17 14:48:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-17 14:50:41 +0200 |
| commit | 187f4278e81c19c79b8a0dbad513e47a00875a57 (patch) | |
| tree | 8bce92071141b185bcd67abbb0cc1cf9429340b5 | |
| parent | 694f9ab1ef141cf80de8f81db6955a17606182af (diff) | |
| parent | a53540840d26beb57a5e53b7f488c23ddf86e193 (diff) | |
| download | ffmpeg-187f4278e81c19c79b8a0dbad513e47a00875a57.tar.gz | |
Merge commit 'a53540840d26beb57a5e53b7f488c23ddf86e193'
* commit 'a53540840d26beb57a5e53b7f488c23ddf86e193':
APIchanges: Mention lavfi and lavd identification symbol addition
Conflicts:
doc/APIchanges
No change as these symbols have been added a very long time ago to FFmpeg
and are already listed in APIchanges
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
0 files changed, 0 insertions, 0 deletions