Michael Niedermayer 32fdfdfbda Merge commit '354468fc12dcf93e7fb4af552e18906771913273' ...

* commit '354468fc12dcf93e7fb4af552e18906771913273':
  avplay: switch to new refcounted frames API
  avconv: convert to new refcounted AVFrame API

Conflicts:
	cmdutils.c
	ffmpeg.c
	ffmpeg.h
	ffplay.c

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

2013-03-12 14:16:02 +01:00

13 KiB

Raw Blame History

View Raw