mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-03-17 20:17:55 +02:00
Merge commit '9745f19ffc9031ce480e43d7cf1053b58100d70f'
* commit '9745f19ffc9031ce480e43d7cf1053b58100d70f': assdec: check the right variable Conflicts: libavcodec/assdec.c See: cc7342f712c0822c3e8f4c36fc55632c59aabac9 Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
76a8127a45