Merge commit 'ca1e36a8e4cd416142487071dbca734567bdaddf'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Jun 2014 21:18:45 +0000 (23:18 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Jun 2014 21:18:45 +0000 (23:18 +0200)
commit4667116c394b29a96a1017e1bf130561676cb498
tree6b03ff9ca2751ee22343fa613a7cf3c813d2ead6
parentfe43facd659f4bf04871d7736701011ebad98932
parentca1e36a8e4cd416142487071dbca734567bdaddf
Merge commit 'ca1e36a8e4cd416142487071dbca734567bdaddf'

* commit 'ca1e36a8e4cd416142487071dbca734567bdaddf':
  h264: fix build when error resilience is disabled

Conflicts:
libavcodec/h264_picture.c

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