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)
* qatar/master:
  Use av_frame_copy() to simplify code where appropriate.

Conflicts:
libavfilter/vf_copy.c

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

Simple merge
Simple merge