diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-20 21:44:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-20 21:44:53 +0200 |
| commit | f2a581e2eeecf85c0e58e1a4bea905d717807045 (patch) | |
| tree | 51f776a1ccfcb056079464da07a947cc36718310 /libavresample/audio_mix.c | |
| parent | a99f0ad194fd48ae8afd9264595b7ca6f45e2a8a (diff) | |
| parent | 05fb4c9aaf84b59f8ab1ce8d4c0f49dd12113024 (diff) | |
| download | ffmpeg-f2a581e2eeecf85c0e58e1a4bea905d717807045.tar.gz | |
Merge commit '05fb4c9aaf84b59f8ab1ce8d4c0f49dd12113024'
* commit '05fb4c9aaf84b59f8ab1ce8d4c0f49dd12113024':
proresenc: Do not entangle coded_frame
Conflicts:
libavcodec/proresenc_kostya.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavresample/audio_mix.c')
0 files changed, 0 insertions, 0 deletions