Merge commit 'b06c8bce02b15115a4789252365df2dda0c4713c'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Dec 2013 22:55:47 +0000 (23:55 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Dec 2013 22:55:51 +0000 (23:55 +0100)
* commit 'b06c8bce02b15115a4789252365df2dda0c4713c':
  mpegvideo: remove an unneeded call to avcodec_get_frame_defaults().

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

Simple merge