From: Michael Niedermayer <michaelni@gmx.at>
Date: Sat, 16 Mar 2013 15:56:30 +0000 (+0100)
Subject: Merge commit 'f4281f457194a6a4489fbd7423e2ab2e13c6d4d9'
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=afb3fb335265a443aac83883606fa4274b4330b7;p=ffmpeg

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>
---

afb3fb335265a443aac83883606fa4274b4330b7