[FFmpeg-cvslog] Merge commit 'f4281f457194a6a4489fbd7423e2ab2e13c6d4d9'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 16 16:56:30 2013 +0100| [afb3fb335265a443aac83883606fa4274b4330b7] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=afb3fb335265a443aac83883606fa4274b4330b7
---