Merge commit 'd88738e4038b162708dc2f5342e10c1694edfd89'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Mar 2013 14:17:15 +0000 (15:17 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Mar 2013 14:17:25 +0000 (15:17 +0100)
commit43c6c1869011a4253841a99693e862ce57ecda5b
treeed9a375820296210ec063bf7fdedcf17611c6ff2
parentb094931ab91108950fec221291bebcbc7b0ac12a
parentd88738e4038b162708dc2f5342e10c1694edfd89
Merge commit 'd88738e4038b162708dc2f5342e10c1694edfd89'

* commit 'd88738e4038b162708dc2f5342e10c1694edfd89':
  mpegvideo: Conditionally build error_resilience bits

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