Merge commit '281a40e18f923510f2067d05c5b0cf08cc49dfee'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Dec 2013 23:14:18 +0000 (00:14 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Dec 2013 23:14:21 +0000 (00:14 +0100)
* commit '281a40e18f923510f2067d05c5b0cf08cc49dfee':
  lavf: remove an unneeded call to avcodec_get_frame_defaults().

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

Simple merge