[FFmpeg-cvslog] Merge commit '05015d03da1d745bb92915b5cea92dec16af719f' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Sun May 12 12:49:36 2013 +0200| [065996b9843b6366bab23d0c6adc61c05c0f9f75] | committer: Michael Niedermayer

Merge commit '05015d03da1d745bb92915b5cea92dec16af719f' into release/1.1

* commit '05015d03da1d745bb92915b5cea92dec16af719f':
  matroska: fix a corner case in ebml-lace parsing
  avfiltergraph: check for sws opts being non-NULL before using them.
  configure: Enable hwaccels without external dependencies by default.
  oma: Validate sample rates

Conflicts:
	libavfilter/avfiltergraph.c
	libavfilter/graphparser.c
	libavformat/oma.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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