Merge commit 'f354f30836a3148275ce60d19bbc581310249ad2'

Browse Source

* commit 'f354f30836a3148275ce60d19bbc581310249ad2':
  error resilience: check error_concealment, not err_recognition.

Conflicts:
	libavcodec/error_resilience.c

See: 346e09638c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

...

This commit is contained in:

Michael Niedermayer 2013-10-28 12:26:31 +01:00

parent 0436ffc294 f354f30836

commit 528f5cdd2c

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