Merge commit '187105ff8a02bafc9c58d9d8363bb3f55a415635'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Sep 2013 08:38:48 +0000 (10:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Sep 2013 08:53:14 +0000 (10:53 +0200)
* commit '187105ff8a02bafc9c58d9d8363bb3f55a415635':
  Fix references to deleted avcodec_encode_video() function

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

diff --cc configure
Simple merge
Simple merge