Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
pull/44/head
Michael Niedermayer 11 years ago
parent 0436ffc294 f354f30836
commit 528f5cdd2c
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File

Diff Content Not Available