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)
commit32fdfdfbdac64c57b12910521af1379a24d01f73
tree865ec201a41ac45d0ce0c58b3d7ea9a438d20d08
parent3c1326411d6ffd2f30c0d6e8cc32d34b5ed5a518
parent354468fc12dcf93e7fb4af552e18906771913273
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>
cmdutils.c
cmdutils.h
ffmpeg.c
ffmpeg.h
ffplay.c