Michael Niedermayer e22e943ef9 Merge commit '674fa49110a661694188a958be13d529b7c8c5dd' ...

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

Conflicts:
	ffmpeg.c

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

2013-12-11 23:36:10 +01:00

125 KiB

Raw Blame History

View Raw