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)
* commit 'd88738e4038b162708dc2f5342e10c1694edfd89':
  mpegvideo: Conditionally build error_resilience bits

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

Simple merge