Merge commit '9745f19ffc9031ce480e43d7cf1053b58100d70f'

Browse Source

* 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:

Michael Niedermayer 2014-12-19 04:53:39 +01:00

parent 5387b0cbfb 9745f19ffc

commit 76a8127a45

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available