Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Feb 2014 09:47:47 +0000 (10:47 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Feb 2014 09:47:47 +0000 (10:47 +0100)
commit2a3cb1cfcaf45fb548b0cddc7c9e155f43582aec
tree4b09f20eeff7289344a0670f2eb4217b6a763d64
parent7a9946d386a3736abde0d7584bef526dc779a36f
parent30517a9f056c8d01b3790871db4aee95d9c176e6
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Use av_frame_copy() to simplify code where appropriate.

Conflicts:
libavfilter/vf_copy.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/libwebpenc.c
libavfilter/vf_copy.c