Michael Niedermayer 24f822c3ab Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  oma: Validate sample rates

Conflicts:
	libavformat/oma.c

See: a30165c4a8

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

2013-04-01 12:48:04 +02:00

14 KiB

Raw Blame History

View Raw