fix merge
avcodec_alloc_frame => av_frame_alloc
Merge branch 'master' of https://github.com/Phonations/Joker