diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-06 21:08:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-06 21:08:55 +0200 |
| commit | d47dd84391f2a4d9dab36b375019bf05d83a5a29 (patch) | |
| tree | 7bd409afd14056dfc1ff541700a3ea60c74e8c45 /libavresample/audio_mix.h | |
| parent | 67ddf21611b904de1ee3eb0206cd2744a135704a (diff) | |
| parent | 577899a6458ccad9026eb268f10dc0b39c224c8d (diff) | |
| download | ffmpeg-d47dd84391f2a4d9dab36b375019bf05d83a5a29.tar.gz | |
Merge commit '577899a6458ccad9026eb268f10dc0b39c224c8d'
* commit '577899a6458ccad9026eb268f10dc0b39c224c8d':
lavc: specify the behavior of av_lockmgr_register on failure.
Conflicts:
libavcodec/avcodec.h
libavcodec/utils.c
libavcodec/version.h
See: a950edb472e8823e34832c7313ba447b2db76f27
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/audio_mix.h')
0 files changed, 0 insertions, 0 deletions