Merge commit '674fa49110a661694188a958be13d529b7c8c5dd'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Dec 2013 22:36:10 +0000 (23:36 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Dec 2013 22:36:10 +0000 (23:36 +0100)
commite22e943ef90e5698df128ed245a530d4b97dc317
tree9dcd4e4f1f3c233d30a236db0c903c80a6bb3d95
parent409a143e4b49b9d1176aaf6c76da536ffd90152b
parent674fa49110a661694188a958be13d529b7c8c5dd
Merge commit '674fa49110a661694188a958be13d529b7c8c5dd'

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

Conflicts:
ffmpeg.c

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