diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-24 10:47:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-24 10:47:47 +0100 |
| commit | 2a3cb1cfcaf45fb548b0cddc7c9e155f43582aec (patch) | |
| tree | 4b09f20eeff7289344a0670f2eb4217b6a763d64 /libavformat/srtp.h | |
| parent | 7a9946d386a3736abde0d7584bef526dc779a36f (diff) | |
| parent | 30517a9f056c8d01b3790871db4aee95d9c176e6 (diff) | |
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>
Diffstat (limited to 'libavformat/srtp.h')
0 files changed, 0 insertions, 0 deletions