diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-19 04:53:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-19 04:54:27 +0100 |
| commit | 76a8127a452f9e149a876c5fa6d6f0634e3b5b1e (patch) | |
| tree | 96d80fa8dfea4ce6e0b78ef16f5af894423c6864 /libavformat/matroskaenc.c | |
| parent | 5387b0cbfb6eef2d502cc22bc2ab4ed7308ffcac (diff) | |
| parent | 9745f19ffc9031ce480e43d7cf1053b58100d70f (diff) | |
Merge commit '9745f19ffc9031ce480e43d7cf1053b58100d70f'
* commit '9745f19ffc9031ce480e43d7cf1053b58100d70f':
assdec: check the right variable
Conflicts:
libavcodec/assdec.c
See: cc7342f712c0822c3e8f4c36fc55632c59aabac9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/matroskaenc.c')
0 files changed, 0 insertions, 0 deletions