Merge commit '5bc69f38c1af71fbcbfb4b5efa77d0aeb5424c04'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 18:03:04 +0000 (19:03 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Mar 2015 18:03:10 +0000 (19:03 +0100)
commitb37b0a58e38438c2673aa0b02e6ae640ad3d3e9a
tree73dc6d314faf8879e814520b56cf3b4cb4b12b11
parent44e4a86c8afca4ac1f7498ff4419364b839a15f9
parent5bc69f38c1af71fbcbfb4b5efa77d0aeb5424c04
Merge commit '5bc69f38c1af71fbcbfb4b5efa77d0aeb5424c04'

* commit '5bc69f38c1af71fbcbfb4b5efa77d0aeb5424c04':
  error_resilience: do not require mbintra/skip tables

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/error_resilience.c
libavcodec/h264.c