[FFmpeg-cvslog] Merge commit '48d17ee6dc2b2a552f645484f200c2946bf24607'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Dec 12 00:19:49 2013 +0100| [525a7d9b78683ce0e44a97283eb7ed23d36ae688] | committer: Michael Niedermayer

Merge commit '48d17ee6dc2b2a552f645484f200c2946bf24607'

* commit '48d17ee6dc2b2a552f645484f200c2946bf24607':
  api-example: remove an unneeded call to avcodec_get_frame_defaults().

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=525a7d9b78683ce0e44a97283eb7ed23d36ae688
---