[FFmpeg-cvslog] Merge commit '674fa49110a661694188a958be13d529b7c8c5dd'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Dec 11 23:36:10 2013 +0100| [e22e943ef90e5698df128ed245a530d4b97dc317] | committer: Michael Niedermayer

Merge commit '674fa49110a661694188a958be13d529b7c8c5dd'

* commit '674fa49110a661694188a958be13d529b7c8c5dd':
  avconv: do not call avcodec_get_frame_defaults()

Conflicts:
	ffmpeg.c

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

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