mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit 'f4281f457194a6a4489fbd7423e2ab2e13c6d4d9'
* commit 'f4281f457194a6a4489fbd7423e2ab2e13c6d4d9': asrc_anullsrc: do not set samplerate and channel layout explicitly Conflicts: libavfilter/asrc_anullsrc.c No change to FFmpeg due to semantic difference between the filter sources Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
afb3fb3352