Merge commit '354468fc12dcf93e7fb4af552e18906771913273'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Mar 2013 12:40:42 +0000 (13:40 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Mar 2013 13:16:02 +0000 (14:16 +0100)
* 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>

No differences found