Merge commit 'fee9db1f'
* commit 'fee9db1f': libavcodec: use avpriv_open() Conflicts: libavcodec/libxvid_rc.c The changed code does not exist in ffmpeg anymore, thus nothing is changed. Merged-by:Michael Niedermayer <michaelni@gmx.at>
Showing
Please
register
or
sign in
to comment