mirror of https://github.com/FFmpeg/FFmpeg.git
* commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e': Give less generic names to global library option arrays Conflicts: libavcodec/options_table.h libavfilter/avfilter.c libavformat/options_table.h libswscale/options.c Merged-by: Michael Niedermayer <michaelni@gmx.at>pull/37/head
commit
a8e963835a
9 changed files with 14 additions and 14 deletions
Loading…
Reference in new issue