Merge commit 'c692957c'
* commit 'c692957c': lavu: remove disabled avoptions cruft lavu: remove disabled FF_API_GET_BITS_PER_SAMPLE_FMT cruft Conflicts: libavutil/opt.c libavutil/opt.h libavutil/version.h Merged-by:Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment