[FFmpeg-cvslog] Merge commit '354468fc12dcf93e7fb4af552e18906771913273'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 12 13:40:42 2013 +0100| [32fdfdfbdac64c57b12910521af1379a24d01f73] | committer: Michael Niedermayer

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 at gmx.at>

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